diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 14:18:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-26 14:18:12 -0700 |
| commit | b18aa6369b4ccbdcef780a6f411c67186398e7cf (patch) | |
| tree | 206df34ecc3c040d40cb3aac6c3421d57aa1c644 | |
| parent | a11a585b76abca29967679c5390999cd25486fb6 (diff) | |
| download | patches-b18aa6369b4ccbdcef780a6f411c67186398e7cf.tar.gz | |
staging build fix
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | staging.current/staging-fix-dt3155-build.patch | 64 |
2 files changed, 66 insertions, 0 deletions
@@ -62,6 +62,7 @@ usb.current/usb-serial-option-zteac8710-support-with-device-id-0xffff.patch staging.current/staging-usbip-fix-deadlock.patch staging.current/staging-dt3155-fix-50hz-configuration.patch staging.current/staging-rtl8192su-add-support-for-belkin-f5d8053-v6.patch +staging.current/staging-fix-dt3155-build.patch ##################################################################### @@ -185,3 +186,4 @@ staging/staging-rtl8192su-add-usb-id-for-0bda-8171.patch staging/staging-intel-restricted-access-region-handler.patch + diff --git a/staging.current/staging-fix-dt3155-build.patch b/staging.current/staging-fix-dt3155-build.patch new file mode 100644 index 00000000000000..58dc3b09f58c66 --- /dev/null +++ b/staging.current/staging-fix-dt3155-build.patch @@ -0,0 +1,64 @@ +From randy.dunlap@oracle.com Mon Apr 26 14:16:59 2010 +From: Randy Dunlap <randy.dunlap@oracle.com> +Date: Wed, 21 Apr 2010 14:32:47 -0700 +Subject: Staging: fix dt3155 build +To: Linus Torvalds <torvalds@linux-foundation.org>, gregkh@suse.de +Cc: Scott Smedley <ss@aao.gov.au> +Message-ID: <20100421143247.eb7e9f39.randy.dunlap@oracle.com> + + +From: Randy Dunlap <randy.dunlap@oracle.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@oracle.com> +Cc: Scott Smedley <ss@aao.gov.au> +Tested-by: Jan III Sobieski <jan3sobi3ski@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/dt3155/dt3155_drv.c | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + +--- a/drivers/staging/dt3155/dt3155_drv.c ++++ b/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; + |