diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-22 11:24:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-22 11:24:41 -0400 |
commit | 43589a832d3189afaaa0efd30a10a16f15891425 (patch) | |
tree | 3aa626595e92c666c1e599d6f103b9ade65907f1 | |
parent | f7c1be0cca2aa39dcea68f54287fb00f840a5ff4 (diff) |
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>
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 6 | ||||
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index c135c9da63b..5e75ee84486 100644 --- 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 | |||
51 | 51 | ||
52 | static int ft1000_ChOpen (struct inode *Inode, struct file *File); | 52 | static int ft1000_ChOpen (struct inode *Inode, struct file *File); |
53 | static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait); | 53 | static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait); |
54 | static int ft1000_ChIoctl (struct inode *Inode, struct file *File, unsigned int Command, | 54 | static int ft1000_ChIoctl(struct file *File, unsigned int Command, |
55 | unsigned long Argument); | 55 | unsigned long Argument); |
56 | static int ft1000_ChRelease (struct inode *Inode, struct file *File); | 56 | static int ft1000_ChRelease (struct inode *Inode, struct file *File); |
57 | 57 | ||
@@ -81,7 +81,7 @@ int numofmsgbuf = 0; | |||
81 | // | 81 | // |
82 | static struct file_operations ft1000fops = | 82 | static struct file_operations ft1000fops = |
83 | { | 83 | { |
84 | ioctl: ft1000_ChIoctl, | 84 | unlocked_ioctl: ft1000_ChIoctl, |
85 | poll: ft1000_ChPoll, | 85 | poll: ft1000_ChPoll, |
86 | open: ft1000_ChOpen, | 86 | open: ft1000_ChOpen, |
87 | release: ft1000_ChRelease | 87 | release: ft1000_ChRelease |
@@ -534,7 +534,7 @@ static unsigned int ft1000_ChPoll(struct file *file, poll_table *wait) | |||
534 | // Notes: | 534 | // Notes: |
535 | // | 535 | // |
536 | //--------------------------------------------------------------------------- | 536 | //--------------------------------------------------------------------------- |
537 | static int ft1000_ChIoctl (struct inode *Inode, struct file *File, unsigned int Command, | 537 | static int ft1000_ChIoctl (struct file *File, unsigned int Command, |
538 | unsigned long Argument) | 538 | unsigned long Argument) |
539 | { | 539 | { |
540 | struct net_device *dev; | 540 | 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 fbaa3d02bb3..80faba51167 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | |||
@@ -31,11 +31,11 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | 33 | ||
34 | #ifdef INIT_NET_NS | 34 | //#ifdef INIT_NET_NS |
35 | #define FTNET_PROC init_net.proc_net | 35 | #define FTNET_PROC init_net.proc_net |
36 | #else | 36 | //#else |
37 | #define FTNET_PROC proc_net | 37 | //#define FTNET_PROC proc_net |
38 | #endif | 38 | //#endif |
39 | 39 | ||
40 | 40 | ||
41 | u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, USHORT indx, | 41 | u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, USHORT indx, |