Staging: ft1000: fix build

This fixes the build for the ft100-usb driver so it builds
properly.

Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
index c135c9da63b1fda97368724048db7814f217c7e1..5e75ee844860d5ba712514a5597efff1e5635a64 100644 (file)
--- 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 inode *Inode, struct file *File, unsigned int Command,
+static int ft1000_ChIoctl(struct file *File, unsigned int Command,
                            unsigned long Argument); 
 static int ft1000_ChRelease (struct inode *Inode, struct file *File);
 
@@ -81,7 +81,7 @@ int numofmsgbuf = 0;
 //
 static struct file_operations ft1000fops =
 {
-    ioctl:    ft1000_ChIoctl,
+    unlocked_ioctl:    ft1000_ChIoctl,
     poll:     ft1000_ChPoll,    
     open:     ft1000_ChOpen,        
     release:  ft1000_ChRelease
@@ -534,7 +534,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait)
 // Notes:
 //
 //---------------------------------------------------------------------------
-static int ft1000_ChIoctl (struct inode *Inode, struct file *File, unsigned int Command,
+static int ft1000_ChIoctl (struct file *File, unsigned int Command,
                            unsigned long Argument) 
 {
     struct net_device *dev;

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
index fbaa3d02bb3a5e428f18a95a404c88d294a417b3..80faba511677997b7e1466fdc493b77509c2b09a 100644 (file)
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
@@ -31,11 +31,11 @@
 
 
 
-#ifdef INIT_NET_NS
+//#ifdef INIT_NET_NS
 #define FTNET_PROC init_net.proc_net
-#else
-#define FTNET_PROC proc_net
-#endif
+//#else
+//#define FTNET_PROC proc_net
+//#endif
 
 
 u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, USHORT indx,