summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-12-13 13:47:36 -0500
committerDave Jones <davej@redhat.com>2011-12-13 13:47:36 -0500
commit5cb46904d4ac6137c31f03ac36181bb3dc49bbee (patch)
treee56e96684fa1d64e5608c297f3eae97d3fc09bd3
parent4a6707e4c9afa1757e101877121ea6a4c3456117 (diff)
downloadkernel-5cb46904d4ac6137c31f03ac36181bb3dc49bbee.tar.gz
kernel-5cb46904d4ac6137c31f03ac36181bb3dc49bbee.tar.xz
kernel-5cb46904d4ac6137c31f03ac36181bb3dc49bbee.zip
disable FDDI/SKFP
-rw-r--r--config-generic4
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index c59837baa..edec14913 100644
--- a/config-generic
+++ b/config-generic
@@ -1469,9 +1469,9 @@ CONFIG_MLX4_EN=m
CONFIG_SFC=m
CONFIG_SFC_MTD=y
-CONFIG_FDDI=y
+# CONFIG_FDDI is not set
# CONFIG_DEFXX is not set
-CONFIG_SKFP=m
+# CONFIG_SKFP is not set
# CONFIG_HIPPI is not set
CONFIG_PLIP=m
CONFIG_PPP=m
diff --git a/kernel.spec b/kernel.spec
index 909982663..b558170fb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2229,6 +2229,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Dec 13 2011 Dave Jones <davej@redhat.com>
+- Disable FDDI/SKFP.
+
* Tue Dec 13 2011 Josh Boyer <jwboyer@redhat.com>
- mod-extras: Don't fail the build if a module is listed that isn't built
- Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)