Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: fix dt3155 build

Browse source 
When the dt3155 driver is built-in (not as a loadable module),
these build errors happen:

  drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration of function 'request_irq'
  drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED' undeclared (first use in this function)
  drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED' undeclared (first use in this function)
  drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration of function 'free_irq'

so remove the #ifdef MODULE check since it's not needed.  Also remove
the CONFIG_PCI check since the Kconfig file already requires that.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Scott Smedley <ss@aao.gov.au>
Tested-by: Jan III Sobieski <jan3sobi3ski@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Randy Dunlap 2010-04-21 14:32:47 -07:00 committed by Linus Torvalds
parent 5e31877b64
commit 74a920139a
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/staging/dt3155/dt3155_drv.c
View file

@ -57,19 +57,8 @@ MA 02111-1307 USA
extern void printques(int); extern void printques(int);
#ifdef MODULE
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
MODULE_LICENSE("GPL");
#endif
#ifndef CONFIG_PCI
#error "DT3155 : Kernel PCI support not enabled (DT3155 drive requires PCI)"
#endif
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/poll.h> #include <linux/poll.h>
@ -84,6 +73,9 @@ MODULE_LICENSE("GPL");
#include "dt3155_io.h" #include "dt3155_io.h"
#include "allocator.h" #include "allocator.h"
MODULE_LICENSE("GPL");
/* Error variable. Zero means no error. */ /* Error variable. Zero means no error. */
int dt3155_errno = 0; int dt3155_errno = 0;