Skip to content

Commit

Permalink
Staging: ft1000: fix build
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Sep 22, 2010
1 parent f7c1be0 commit 43589a8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/ft1000/ft1000-usb/ft1000_proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 43589a8

Please sign in to comment.