diff options
| author | Dave Jones <davej@redhat.com> | 2013-04-03 14:31:59 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2013-04-03 14:31:59 -0400 |
| commit | da97680e58b9f169d215748d75b85442f35dba3f (patch) | |
| tree | 75c59aa80ba40f0c7dcde498fe73d8cf4a545ca2 | |
| parent | 11af844f555335b63abc9875b936fac593a1c9b1 (diff) | |
| download | kernel-da97680e58b9f169d215748d75b85442f35dba3f.tar.gz kernel-da97680e58b9f169d215748d75b85442f35dba3f.tar.xz kernel-da97680e58b9f169d215748d75b85442f35dba3f.zip | |
Enable MTD_CHAR/MTD_BLOCK (Needed for SFC)
Enable 10gigE on 64-bit only.
| -rw-r--r-- | config-generic | 13 | ||||
| -rw-r--r-- | config-x86_64-generic | 21 | ||||
| -rw-r--r-- | kernel.spec | 4 |
3 files changed, 28 insertions, 10 deletions
diff --git a/config-generic b/config-generic index 793f19c9c..e2be1bc44 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 64e5c332a..92f283073 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 839473439..30a3b6f9b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2271,6 +2271,10 @@ fi # ||----w | # || || %changelog +* Wed Apr 03 2013 Dave Jones <davej@redhat.com> +- Enable MTD_CHAR/MTD_BLOCK (Needed for SFC) + Enable 10gigE on 64-bit only. + * Wed Apr 03 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git2.1 - Linux v3.9-rc5-146-gda241ef |