diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-19 16:32:30 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-20 07:28:12 -0500 |
| commit | 217da4eb7b200560792b61a34674d00088e45657 (patch) | |
| tree | 941ac7813d20f062fe4cd814b2c5e6c24e4cd119 /compat-wireless-config-fixups.patch | |
| parent | 92505b0d0fb617d57f1adc45aa01d0eaeb16c681 (diff) | |
| download | kernel-217da4eb7b200560792b61a34674d00088e45657.tar.gz kernel-217da4eb7b200560792b61a34674d00088e45657.tar.xz kernel-217da4eb7b200560792b61a34674d00088e45657.zip | |
modpost: add option to allow external modules to avoid taint
Make integrated compat-wireless take advantage of the above
Turn-on backports again, since TAINT_OOT_MODULE issue is resolved
Update compat-wireless snapshot from 2011-12-18
Diffstat (limited to 'compat-wireless-config-fixups.patch')
| -rw-r--r-- | compat-wireless-config-fixups.patch | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch index 411ee40c6..d73698e2c 100644 --- a/compat-wireless-config-fixups.patch +++ b/compat-wireless-config-fixups.patch @@ -1,6 +1,6 @@ -diff -up compat-wireless-3.2-rc1-1/config.mk.orig compat-wireless-3.2-rc1-1/config.mk ---- compat-wireless-3.2-rc1-1/config.mk.orig 2011-11-22 13:09:50.422879313 -0500 -+++ compat-wireless-3.2-rc1-1/config.mk 2011-11-22 13:10:28.870398679 -0500 +diff -up compat-wireless-2011-12-18/config.mk.orig compat-wireless-2011-12-18/config.mk +--- compat-wireless-2011-12-18/config.mk.orig 2011-12-18 16:10:34.000000000 -0500 ++++ compat-wireless-2011-12-18/config.mk 2011-12-19 15:54:24.962156028 -0500 @@ -14,6 +14,9 @@ else include $(KLIB_BUILD)/.config endif @@ -10,18 +10,16 @@ diff -up compat-wireless-3.2-rc1-1/config.mk.orig compat-wireless-3.2-rc1-1/conf + ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) - COMPAT_LATEST_VERSION = 1 -diff -up compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile.orig compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile ---- compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile.orig 2011-11-22 13:09:50.423879301 -0500 -+++ compat-wireless-3.2-rc1-1/drivers/misc/eeprom/Makefile 2011-11-22 13:10:28.871398662 -0500 -@@ -1,3 +1,3 @@ + COMPAT_LATEST_VERSION = 3 +diff -up compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile +--- compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig 2011-12-18 16:10:36.000000000 -0500 ++++ compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile 2011-12-19 15:54:24.963156015 -0500 +@@ -1 +1 @@ -obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o +#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o - obj-$(CONFIG_EEPROM_93XX46) += eeprom_93xx46.o - obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o -diff -up compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile ---- compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile.orig 2011-11-22 13:09:50.423879301 -0500 -+++ compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile 2011-11-22 13:10:28.871398662 -0500 +diff -up compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile +--- compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig 2011-12-18 16:10:35.000000000 -0500 ++++ compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile 2011-12-19 15:54:24.963156015 -0500 @@ -2,7 +2,7 @@ # Makefile for the Atheros network device drivers. # @@ -34,9 +32,9 @@ diff -up compat-wireless-3.2-rc1-1/drivers/net/ethernet/atheros/Makefile.orig co +#obj-$(CONFIG_ATL2) += atlx/ +#obj-$(CONFIG_ATL1E) += atl1e/ +#obj-$(CONFIG_ATL1C) += atl1c/ -diff -up compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile.orig compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile ---- compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile.orig 2011-11-22 13:09:50.424879289 -0500 -+++ compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile 2011-11-22 13:10:28.872398646 -0500 +diff -up compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig compat-wireless-2011-12-18/drivers/net/usb/Makefile +--- compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig 2011-12-18 16:10:36.000000000 -0500 ++++ compat-wireless-2011-12-18/drivers/net/usb/Makefile 2011-12-19 15:54:24.964156002 -0500 @@ -2,7 +2,7 @@ # Makefile for USB Network drivers # @@ -48,9 +46,9 @@ diff -up compat-wireless-3.2-rc1-1/drivers/net/usb/Makefile.orig compat-wireless +#obj-$(CONFIG_USB_NET_COMPAT_RNDIS_HOST) += rndis_host.o +#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o -diff -up compat-wireless-3.2-rc1-1/Makefile.orig compat-wireless-3.2-rc1-1/Makefile ---- compat-wireless-3.2-rc1-1/Makefile.orig 2011-11-22 13:10:37.165294951 -0500 -+++ compat-wireless-3.2-rc1-1/Makefile 2011-11-22 13:10:47.335167758 -0500 +diff -up compat-wireless-2011-12-18/Makefile.orig compat-wireless-2011-12-18/Makefile +--- compat-wireless-2011-12-18/Makefile.orig 2011-12-18 16:10:34.000000000 -0500 ++++ compat-wireless-2011-12-18/Makefile 2011-12-19 15:54:24.965155989 -0500 @@ -41,8 +41,8 @@ endif endif |