From b91a01427066565b296908d4c80a728d89f0e3c9 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 30 Sep 2010 10:24:08 +0200 Subject: [PATCH] --- yaml --- r: 220019 b: refs/heads/master c: 4fea0749b19a1df25482453b45d2a3d69c1670dc h: refs/heads/master i: 220017: b7f18937af67a3fbd17eb5a2feaac161d6669eb6 220015: e95e801281430f73af55f6db1c06efec774e8b73 v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 27c92797e42c..077612eb22fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d16044cf8ce0ff6384cd80eb0abaa2ba57b19a5e +refs/heads/master: 4fea0749b19a1df25482453b45d2a3d69c1670dc diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 89d9a5848791..44b037c2033e 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/trunk/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;