openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Greg Kroah-Hartman 2010-09-22 08:24:41 -07:00
parent f7c1be0cca
commit 43589a832d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
View File

@ -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;

8
drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
View File

@ -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,