[PATCH 03/10] bkl: Fix up compile problems in megaraid from bkl push-down
in [Kernel]
|
Prev: [PATCH 10/10] bkl: Fix-up compile problems as a result of the bkl-pushdown.
Next: [PATCH 08/10] v4l: always use unlocked_ioctl
From: John Kacur on 27 Apr 2010 05:30 - Forward declaration missing ';' - Conflicting declaraction in megaraid.h changed Signed-off-by: John Kacur <jkacur(a)redhat.com> --- drivers/scsi/megaraid.c | 2 +- drivers/scsi/megaraid.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index c20b621..0b6e322 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -92,7 +92,7 @@ static struct proc_dir_entry *mega_proc_dir_entry; static struct mega_hbas mega_hbas[MAX_CONTROLLERS]; static long -megadev_unlocked_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) +megadev_unlocked_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); /* * The File Operations structure for the serial/ioctl interface of the driver diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index d310f49..b3d2949 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h @@ -1013,8 +1013,8 @@ static void mega_8_to_40ld (mraid_inquiry *inquiry, mega_inquiry3 *enquiry3, mega_product_info *); static int megadev_open (struct inode *, struct file *); -static int megadev_ioctl (struct inode *, struct file *, unsigned int, - unsigned long); +static int +megadev_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); static int mega_m_to_n(void __user *, nitioctl_t *); static int mega_n_to_m(void __user *, megacmd_t *); -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |