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>
This commit is contained in:
parent
f7c1be0cca
commit
43589a832d
|
@ -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 int ft1000_ChOpen (struct inode *Inode, struct file *File);
|
||||||
static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait);
|
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);
|
unsigned long Argument);
|
||||||
static int ft1000_ChRelease (struct inode *Inode, struct file *File);
|
static int ft1000_ChRelease (struct inode *Inode, struct file *File);
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ int numofmsgbuf = 0;
|
||||||
//
|
//
|
||||||
static struct file_operations ft1000fops =
|
static struct file_operations ft1000fops =
|
||||||
{
|
{
|
||||||
ioctl: ft1000_ChIoctl,
|
unlocked_ioctl: ft1000_ChIoctl,
|
||||||
poll: ft1000_ChPoll,
|
poll: ft1000_ChPoll,
|
||||||
open: ft1000_ChOpen,
|
open: ft1000_ChOpen,
|
||||||
release: ft1000_ChRelease
|
release: ft1000_ChRelease
|
||||||
|
@ -534,7 +534,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait)
|
||||||
// Notes:
|
// 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)
|
unsigned long Argument)
|
||||||
{
|
{
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
|
|
|
@ -31,11 +31,11 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef INIT_NET_NS
|
//#ifdef INIT_NET_NS
|
||||||
#define FTNET_PROC init_net.proc_net
|
#define FTNET_PROC init_net.proc_net
|
||||||
#else
|
//#else
|
||||||
#define FTNET_PROC proc_net
|
//#define FTNET_PROC proc_net
|
||||||
#endif
|
//#endif
|
||||||
|
|
||||||
|
|
||||||
u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, USHORT indx,
|
u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, USHORT indx,
|
||||||
|
|
Loading…
Reference in New Issue