[kernel/f18] Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)
Dave Jones
davej at fedoraproject.org
Wed Apr 3 18:48:56 UTC 2013
commit 58d2019abdba1e9ea87abe76579ee80fc00244ab
Author: Dave Jones <davej at redhat.com>
Date: Wed Apr 3 14:48:46 2013 -0400
Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)
Enable 10gigE on 64-bit only.
config-generic | 12 +++---------
config-x86_64-generic | 15 +++++++++++++++
kernel.spec | 4 ++++
3 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/config-generic b/config-generic
index e9c7f33..5c137e6 100644
--- a/config-generic
+++ b/config-generic
@@ -1426,16 +1426,10 @@ CONFIG_JME=m
#
# Ethernet (10000 Mbit)
#
-CONFIG_IP1000=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_EN_DCB=y
+# CONFIG_IP1000 is not set
+# CONFIG_MLX4_EN is not set
# CONFIG_MLX4_DEBUG is not set
-CONFIG_SFC=m
-CONFIG_SFC_MCDI_MON=y
-CONFIG_SFC_SRIOV=y
-CONFIG_SFC_PTP=y
-
-# CONFIG_SFC_MTD is not set
+# CONFIG_SFC is not set
# CONFIG_FDDI is not set
# CONFIG_DEFXX is not set
diff --git a/config-x86_64-generic b/config-x86_64-generic
index bcea67e..f4fc09d 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -130,3 +130,18 @@ CONFIG_BPF_JIT=y
# Should be 32bit only, but lacks KConfig depends
# CONFIG_XO15_EBOOK is not set
+# 10GigE
+#
+CONFIG_IP1000=m
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+# CONFIG_MLX4_DEBUG is not set
+CONFIG_SFC=m
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_PTP=y
+CONFIG_SFC_MTD=y
+# Override MTD stuff because SFC_MTD needs it
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLOCK=m
+
diff --git a/kernel.spec b/kernel.spec
index 8532a6d..9be4250 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2402,6 +2402,10 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Apr 03 2013 Dave Jones <davej at redhat.com>
+- Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)
+ Enable 10gigE on 64-bit only.
+
* Tue Apr 02 2013 Josh Boyer <jwboyer at redhat.com>
- Enable CONFIG_FB_MATROX_G on powerpc
- Add support for Atheros 04ca:3004 bluetooth devices (again) (rhbz 844750)
More information about the scm-commits
mailing list