linux-kernel - [PATCH resend] staging: fix dt3155 build

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 21 Apr 2010 14:32:47 -0700
From:	Randy Dunlap <randy.dunlap@...cle.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>, gregkh@...e.de
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Scott Smedley <ss@....gov.au>
Subject: [PATCH resend] staging: fix dt3155 build

From: Randy Dunlap <randy.dunlap@...cle.com>

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@...cle.com>
Cc: Scott Smedley <ss@....gov.au>
Tested-by: Jan III Sobieski <jan3sobi3ski@...il.com>
---
 drivers/staging/dt3155/dt3155_drv.c |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

--- lnx-2634-rc5.orig/drivers/staging/dt3155/dt3155_drv.c
+++ lnx-2634-rc5/drivers/staging/dt3155/dt3155_drv.c
@@ -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;
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/