diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch index 722c6c820..7bb19bcdc 100644 --- a/compat-wireless-config-fixups.patch +++ b/compat-wireless-config-fixups.patch @@ -11,12 +11,6 @@ diff -up compat-wireless-3.3-rc1-2/config.mk.orig compat-wireless-3.3-rc1-2/conf ifneq ($(wildcard $(KLIB_BUILD)/Makefile),) COMPAT_LATEST_VERSION = 3 -diff -up compat-wireless-3.3-rc1-2/drivers/misc/eeprom/Makefile.orig compat-wireless-3.3-rc1-2/drivers/misc/eeprom/Makefile ---- compat-wireless-3.3-rc1-2/drivers/misc/eeprom/Makefile.orig 2012-01-21 02:08:39.000000000 -0500 -+++ compat-wireless-3.3-rc1-2/drivers/misc/eeprom/Makefile 2012-01-24 15:16:38.204409844 -0500 -@@ -1 +1 @@ --obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o -+#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o diff -up compat-wireless-3.3-rc1-2/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-3.3-rc1-2/drivers/net/ethernet/atheros/Makefile --- compat-wireless-3.3-rc1-2/drivers/net/ethernet/atheros/Makefile.orig 2012-01-21 02:08:39.000000000 -0500 +++ compat-wireless-3.3-rc1-2/drivers/net/ethernet/atheros/Makefile 2012-01-24 15:16:38.204409844 -0500 diff --git a/config-backports b/config-backports index 33a3adcce..c9ccf2033 100644 --- a/config-backports +++ b/config-backports @@ -16,6 +16,11 @@ # # CONFIG_B43_BCMA is not set +# +# Several wireless drivers have this chip, use the backported driver version +# +# CONFIG_EEPROM_93CX6 is not set + # # These have to be turned-on again since compat-wireless does not # provide them... diff --git a/kernel.spec b/kernel.spec index 0db6ce671..88d41007d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2289,6 +2289,9 @@ fi # and build. %changelog +* Mon Jan 30 2012 John W. Linville +- Use the eeprom_93cx6 driver from the compat-wireless package + * Fri Jan 27 2012 John W. Linville - Include config.mk from compat-wireless build in files for installation