[kernel/f16] Use the eeprom_93cx6 driver from the compat-wireless package
John W. Linville
linville at fedoraproject.org
Mon Jan 30 15:29:40 UTC 2012
commit 2cad290c4564dd3a0cc8eaeb65c99bc7e49f4500
Author: John W. Linville <linville at tuxdriver.com>
Date: Mon Jan 30 10:27:28 2012 -0500
Use the eeprom_93cx6 driver from the compat-wireless package
compat-wireless-config-fixups.patch | 6 ------
config-backports | 5 +++++
kernel.spec | 3 +++
3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/compat-wireless-config-fixups.patch b/compat-wireless-config-fixups.patch
index 722c6c8..7bb19bc 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 33a3adc..c9ccf20 100644
--- a/config-backports
+++ b/config-backports
@@ -17,6 +17,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 0db6ce6..88d4100 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2289,6 +2289,9 @@ fi
# and build.
%changelog
+* Mon Jan 30 2012 John W. Linville <linville at redhat.com>
+- Use the eeprom_93cx6 driver from the compat-wireless package
+
* Fri Jan 27 2012 John W. Linville <linville at redhat.com>
- Include config.mk from compat-wireless build in files for installation
More information about the scm-commits
mailing list