diff options
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/eth1394.c | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/iso.c | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/pcilynx.c | 1 | ||||
| -rw-r--r-- | drivers/ieee1394/raw1394.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/video1394.c | 2 |
7 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 55d6ae6..dee9529 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c @@ -2147,7 +2147,7 @@ out: } static struct cdev dv1394_cdev; -static struct file_operations dv1394_fops= +static const struct file_operations dv1394_fops= { .owner = THIS_MODULE, .poll = dv1394_poll, diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 97e5c3d..a953135 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c @@ -43,7 +43,6 @@ #include <linux/module.h> -#include <linux/sched.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/errno.h> diff --git a/drivers/ieee1394/iso.c b/drivers/ieee1394/iso.c index 08bd15d..c6227e5 100644 --- a/drivers/ieee1394/iso.c +++ b/drivers/ieee1394/iso.c @@ -10,7 +10,6 @@ */ #include <linux/pci.h> -#include <linux/sched.h> #include <linux/slab.h> #include "hosts.h" diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 5729e41..e982d60 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -102,7 +102,6 @@ #include <asm/pgtable.h> #include <asm/page.h> #include <asm/irq.h> -#include <linux/sched.h> #include <linux/types.h> #include <linux/vmalloc.h> #include <linux/init.h> diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index fbb7f14..0742bef 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c @@ -1434,6 +1434,7 @@ static int __devinit add_card(struct pci_dev *dev, i2c_adapter_data = bit_data; i2c_ad->algo_data = &i2c_adapter_data; i2c_adapter_data.data = lynx; + i2c_ad->dev.parent = &dev->dev; PRINTD(KERN_DEBUG, lynx->id,"original eeprom control: %d", reg_read(lynx, SERIAL_EEPROM_CONTROL)); diff --git a/drivers/ieee1394/raw1394.c b/drivers/ieee1394/raw1394.c index 5d08d74..bb897a3 100644 --- a/drivers/ieee1394/raw1394.c +++ b/drivers/ieee1394/raw1394.c @@ -3033,7 +3033,7 @@ static struct hpsb_highlevel raw1394_highlevel = { }; static struct cdev raw1394_cdev; -static struct file_operations raw1394_fops = { +static const struct file_operations raw1394_fops = { .owner = THIS_MODULE, .read = raw1394_read, .write = raw1394_write, diff --git a/drivers/ieee1394/video1394.c b/drivers/ieee1394/video1394.c index f4d1ec00..95ca26d 100644 --- a/drivers/ieee1394/video1394.c +++ b/drivers/ieee1394/video1394.c @@ -1277,7 +1277,7 @@ static long video1394_compat_ioctl(struct file *f, unsigned cmd, unsigned long a #endif static struct cdev video1394_cdev; -static struct file_operations video1394_fops= +static const struct file_operations video1394_fops= { .owner = THIS_MODULE, .unlocked_ioctl = video1394_ioctl, |
