[kernel] r17161 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Aurelien Jarno]

Author: aurel32
Date: Wed Mar 30 13:27:14 2011
New Revision: 17161

Log:
* rtlwifi: fix build when PCI is not enabled.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch
   dists/sid/linux-2.6/debian/patches/series/3
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Mar 30 12:40:22 2011	(r17160)
+++ dists/sid/linux-2.6/debian/changelog	Wed Mar 30 13:27:14 2011	(r17161)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * [ppc64] Add to linux-tools package architectures (Closes: #620124)
+  * rtlwifi: fix build when PCI is not enabled.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 30 Mar 2011 13:30:17 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch	Wed Mar 30 13:27:14 2011	(r17161)
@@ -0,0 +1,31 @@
+commit 892c05c093858086d808aeb366b2e11106dd96c6
+Author: Willy Tarreau <w at 1wt.eu>
+Date:   Sun Feb 20 11:43:07 2011 +0100
+
+    rtlwifi: Let rtlwifi build when PCI is not enabled
+    
+    On systems where PCI does not exist, a build of rtlwifi will fail.
+    Apply the same fix in case there are systems with PCI but not USB.
+    
+    Signed-off-by: Willy Tarreau <w at 1wt.eu>
+    Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
+    Signed-off-by: John W. Linville <linville at tuxdriver.com>
+
+diff --git a/drivers/net/wireless/rtlwifi/Makefile b/drivers/net/wireless/rtlwifi/Makefile
+index c3e83a1..52be12e 100644
+--- a/drivers/net/wireless/rtlwifi/Makefile
++++ b/drivers/net/wireless/rtlwifi/Makefile
+@@ -5,9 +5,12 @@ rtlwifi-objs	:=		\
+ 		core.o		\
+ 		debug.o		\
+ 		efuse.o		\
+-		pci.o		\
+ 		ps.o		\
+ 		rc.o		\
+ 		regd.o
+ 
++ifneq ($(CONFIG_PCI),)
++rtlwifi-objs	+= pci.o
++endif
++
+ obj-$(CONFIG_RTL8192CE)		+= rtl8192ce/

Added: dists/sid/linux-2.6/debian/patches/series/3
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/3	Wed Mar 30 13:27:14 2011	(r17161)
@@ -0,0 +1 @@
++ bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch