diff options
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 5760b9f033ea..7695a4c66e80 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24-rc4 | 3 | # Linux kernel version: 2.6.24-rc4 |
4 | # Thu Dec 6 16:49:07 2007 | 4 | # Fri Dec 21 14:47:29 2007 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -211,7 +211,7 @@ CONFIG_MMIO_NVRAM=y | |||
211 | CONFIG_MPIC_U3_HT_IRQS=y | 211 | CONFIG_MPIC_U3_HT_IRQS=y |
212 | CONFIG_MPIC_BROKEN_REGREAD=y | 212 | CONFIG_MPIC_BROKEN_REGREAD=y |
213 | CONFIG_IBMVIO=y | 213 | CONFIG_IBMVIO=y |
214 | # CONFIG_IBMEBUS is not set | 214 | CONFIG_IBMEBUS=y |
215 | # CONFIG_PPC_MPC106 is not set | 215 | # CONFIG_PPC_MPC106 is not set |
216 | CONFIG_PPC_970_NAP=y | 216 | CONFIG_PPC_970_NAP=y |
217 | CONFIG_PPC_INDIRECT_IO=y | 217 | CONFIG_PPC_INDIRECT_IO=y |
@@ -375,7 +375,7 @@ CONFIG_INET_TUNNEL=y | |||
375 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 375 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
376 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 376 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
377 | CONFIG_INET_XFRM_MODE_BEET=y | 377 | CONFIG_INET_XFRM_MODE_BEET=y |
378 | # CONFIG_INET_LRO is not set | 378 | CONFIG_INET_LRO=m |
379 | CONFIG_INET_DIAG=y | 379 | CONFIG_INET_DIAG=y |
380 | CONFIG_INET_TCP_DIAG=y | 380 | CONFIG_INET_TCP_DIAG=y |
381 | # CONFIG_TCP_CONG_ADVANCED is not set | 381 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -929,6 +929,7 @@ CONFIG_SPIDER_NET=m | |||
929 | CONFIG_NETDEV_10000=y | 929 | CONFIG_NETDEV_10000=y |
930 | # CONFIG_CHELSIO_T1 is not set | 930 | # CONFIG_CHELSIO_T1 is not set |
931 | # CONFIG_CHELSIO_T3 is not set | 931 | # CONFIG_CHELSIO_T3 is not set |
932 | CONFIG_EHEA=m | ||
932 | # CONFIG_IXGBE is not set | 933 | # CONFIG_IXGBE is not set |
933 | CONFIG_IXGB=m | 934 | CONFIG_IXGB=m |
934 | # CONFIG_IXGB_NAPI is not set | 935 | # CONFIG_IXGB_NAPI is not set |
@@ -1558,6 +1559,7 @@ CONFIG_INFINIBAND_ADDR_TRANS=y | |||
1558 | CONFIG_INFINIBAND_MTHCA=m | 1559 | CONFIG_INFINIBAND_MTHCA=m |
1559 | CONFIG_INFINIBAND_MTHCA_DEBUG=y | 1560 | CONFIG_INFINIBAND_MTHCA_DEBUG=y |
1560 | # CONFIG_INFINIBAND_IPATH is not set | 1561 | # CONFIG_INFINIBAND_IPATH is not set |
1562 | CONFIG_INFINIBAND_EHCA=m | ||
1561 | # CONFIG_INFINIBAND_AMSO1100 is not set | 1563 | # CONFIG_INFINIBAND_AMSO1100 is not set |
1562 | # CONFIG_MLX4_INFINIBAND is not set | 1564 | # CONFIG_MLX4_INFINIBAND is not set |
1563 | CONFIG_INFINIBAND_IPOIB=m | 1565 | CONFIG_INFINIBAND_IPOIB=m |