From: Arnd Bergmann Date: Thu, 30 Sep 2010 08:24:08 +0000 (+0200) Subject: staging/ft1000-usb: fix unlocked_ioctl prototype X-Git-Tag: v2.6.37-rc1~60^2~3^2~428 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4fea0749b19a1df25482453b45d2a3d69c1670dc;p=linux.git staging/ft1000-usb: fix unlocked_ioctl prototype unlocked_ioctl has a "long" return type. Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 89d9a5848791..44b037c2033e 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c @@ -51,7 +51,7 @@ extern void CardSendCommand(struct ft1000_device *ft1000dev, unsigned short *pte static int ft1000_ChOpen (struct inode *Inode, struct file *File); static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait); -static int ft1000_ChIoctl(struct file *File, unsigned int Command, +static long ft1000_ChIoctl(struct file *File, unsigned int Command, unsigned long Argument); static int ft1000_ChRelease (struct inode *Inode, struct file *File); @@ -536,7 +536,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait) // Notes: // //--------------------------------------------------------------------------- -static int ft1000_ChIoctl (struct file *File, unsigned int Command, +static long ft1000_ChIoctl (struct file *File, unsigned int Command, unsigned long Argument) { struct net_device *dev;