Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43589a83 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f7c1be0c

drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/ft1000/ft1000-usb/ft1000_proc.c

+4 −4
Original line number Diff line number Diff line
@@ -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,