Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a92013 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

staging: fix dt3155 build 



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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Cc: Scott Smedley <ss@aao.gov.au>
Tested-by: default avatarJan III Sobieski <jan3sobi3ski@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5e31877b

drivers/staging/dt3155/dt3155_drv.c

+3 −11
Original line number Diff line number Diff line
@@ -57,19 +57,8 @@ MA 02111-1307 USA 


extern void printques(int);



#ifdef MODULE

#include <linux/module.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/types.h>

#include <linux/poll.h>
@@ -84,6 +73,9 @@ MODULE_LICENSE("GPL"); 
#include "dt3155_io.h"

#include "allocator.h"





MODULE_LICENSE("GPL");



/* Error variable.  Zero means no error. */

int dt3155_errno = 0;