diff --git a/debian/changelog b/debian/changelog index 36f7fa133..ce68b9428 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux-2.6 (2.6.38-3) UNRELEASED; urgency=low [ Ben Hutchings ] * [ppc64] Add to linux-tools package architectures (Closes: #620124) + * rtlwifi: fix build when PCI is not enabled. -- Ben Hutchings Wed, 30 Mar 2011 13:30:17 +0100 diff --git a/debian/patches/bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch b/debian/patches/bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch new file mode 100644 index 000000000..c1beb22d1 --- /dev/null +++ b/debian/patches/bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch @@ -0,0 +1,31 @@ +commit 892c05c093858086d808aeb366b2e11106dd96c6 +Author: Willy Tarreau +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 + Signed-off-by: Larry Finger + Signed-off-by: John W. Linville + +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/ diff --git a/debian/patches/series/3 b/debian/patches/series/3 new file mode 100644 index 000000000..5807479ca --- /dev/null +++ b/debian/patches/series/3 @@ -0,0 +1 @@ ++ bugfix/all/rtlwifi-Let-rtlwifi-build-when-PCI-is-not-enabled.patch