lkml.org 
[lkml]   [2010]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/10] bkl: Fix up compile problems in megaraid from bkl push-down
    Date
    - Forward declaration missing ';'
    - Conflicting declaraction in megaraid.h changed

    Signed-off-by: John Kacur <jkacur@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


    \
     
     \ /
      Last update: 2010-04-27 11:23    [W:0.037 / U:129.532 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site