[kernel] Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)

[Dave Jones]

commit da97680e58b9f169d215748d75b85442f35dba3f
Author: Dave Jones <davej at redhat.com>
Date:   Wed Apr 3 14:31:59 2013 -0400

    Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)
    
    Enable 10gigE on 64-bit only.

 config-generic        |   13 +++----------
 config-x86_64-generic |   21 +++++++++++++++++++++
 kernel.spec           |    4 ++++
 3 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/config-generic b/config-generic
index 793f19c..e2be1bc 100644
--- a/config-generic
+++ b/config-generic
@@ -1447,16 +1447,9 @@ CONFIG_JME=m
 #
 # Ethernet (10000 Mbit)
 #
-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 is not set
+# CONFIG_IP1000 is not set
+# CONFIG_MLX4_EN 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 64e5c33..92f2830 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -136,3 +136,24 @@ CONFIG_CHECKPOINT_RESTORE=y
 
 CONFIG_NTB=m
 CONFIG_NTB_NETDEV=m
+
+CONFIG_SFC=m
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_PTP=y
+
+# 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 8394734..30a3b6f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2271,6 +2271,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.
+
 * Wed Apr 03 2013 Justin M. Forbes <jforbes at redhat.com> - 3.9.0-0.rc5.git2.1
 - Linux v3.9-rc5-146-gda241ef