aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-07-06 09:13:14 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-07-19 01:13:06 -0400
commit29cd9913942a56cce612e0821fec976f29bc1e9b (patch)
tree2665b337c0408f142e013b7837782f35e756a999 /arch/powerpc
parent51d33021425e1f905beb4208823146f2fb6517da (diff)
powerpc: Sync pseries and ppc64 defconfigs
The pseries defconfig had a number of drivers enabled and we may as well add them to the ppc64 defconfig. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/configs/ppc64_defconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 76736017cd3..b4398e43282 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -176,12 +176,18 @@ CONFIG_CHR_DEV_SG=y
176CONFIG_SCSI_MULTI_LUN=y 176CONFIG_SCSI_MULTI_LUN=y
177CONFIG_SCSI_CONSTANTS=y 177CONFIG_SCSI_CONSTANTS=y
178CONFIG_SCSI_FC_ATTRS=y 178CONFIG_SCSI_FC_ATTRS=y
179CONFIG_SCSI_SAS_ATTRS=m
180CONFIG_SCSI_CXGB3_ISCSI=m
181CONFIG_SCSI_CXGB4_ISCSI=m
182CONFIG_SCSI_BNX2_ISCSI=m
183CONFIG_BE2ISCSI=m
179CONFIG_SCSI_IBMVSCSI=y 184CONFIG_SCSI_IBMVSCSI=y
180CONFIG_SCSI_IBMVFC=m 185CONFIG_SCSI_IBMVFC=m
181CONFIG_SCSI_SYM53C8XX_2=y 186CONFIG_SCSI_SYM53C8XX_2=y
182CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 187CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
183CONFIG_SCSI_IPR=y 188CONFIG_SCSI_IPR=y
184CONFIG_SCSI_QLA_FC=m 189CONFIG_SCSI_QLA_FC=m
190CONFIG_SCSI_QLA_ISCSI=m
185CONFIG_SCSI_LPFC=m 191CONFIG_SCSI_LPFC=m
186CONFIG_ATA=y 192CONFIG_ATA=y
187CONFIG_SATA_SIL24=y 193CONFIG_SATA_SIL24=y
@@ -235,11 +241,13 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
235CONFIG_E1000=y 241CONFIG_E1000=y
236CONFIG_E1000E=y 242CONFIG_E1000E=y
237CONFIG_TIGON3=y 243CONFIG_TIGON3=y
244CONFIG_BNX2=m
238CONFIG_SPIDER_NET=m 245CONFIG_SPIDER_NET=m
239CONFIG_GELIC_NET=m 246CONFIG_GELIC_NET=m
240CONFIG_GELIC_WIRELESS=y 247CONFIG_GELIC_WIRELESS=y
241CONFIG_CHELSIO_T1=m 248CONFIG_CHELSIO_T1=m
242CONFIG_CHELSIO_T3=m 249CONFIG_CHELSIO_T3=m
250CONFIG_CHELSIO_T4=m
243CONFIG_EHEA=m 251CONFIG_EHEA=m
244CONFIG_IXGBE=m 252CONFIG_IXGBE=m
245CONFIG_IXGB=m 253CONFIG_IXGB=m
@@ -248,6 +256,8 @@ CONFIG_MYRI10GE=m
248CONFIG_NETXEN_NIC=m 256CONFIG_NETXEN_NIC=m
249CONFIG_PASEMI_MAC=y 257CONFIG_PASEMI_MAC=y
250CONFIG_MLX4_EN=m 258CONFIG_MLX4_EN=m
259CONFIG_QLGE=m
260CONFIG_BE2NET=m
251CONFIG_ISERIES_VETH=m 261CONFIG_ISERIES_VETH=m
252CONFIG_PPP=m 262CONFIG_PPP=m
253CONFIG_PPP_ASYNC=m 263CONFIG_PPP_ASYNC=m
@@ -330,6 +340,8 @@ CONFIG_INFINIBAND_USER_MAD=m
330CONFIG_INFINIBAND_USER_ACCESS=m 340CONFIG_INFINIBAND_USER_ACCESS=m
331CONFIG_INFINIBAND_MTHCA=m 341CONFIG_INFINIBAND_MTHCA=m
332CONFIG_INFINIBAND_EHCA=m 342CONFIG_INFINIBAND_EHCA=m
343CONFIG_INFINIBAND_CXGB3=m
344CONFIG_INFINIBAND_CXGB4=m
333CONFIG_MLX4_INFINIBAND=m 345CONFIG_MLX4_INFINIBAND=m
334CONFIG_INFINIBAND_IPOIB=m 346CONFIG_INFINIBAND_IPOIB=m
335CONFIG_INFINIBAND_IPOIB_CM=y 347CONFIG_INFINIBAND_IPOIB_CM=y