diff options
author | Anton Blanchard <anton@samba.org> | 2011-07-06 09:13:14 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-07-19 01:13:06 -0400 |
commit | 29cd9913942a56cce612e0821fec976f29bc1e9b (patch) | |
tree | 2665b337c0408f142e013b7837782f35e756a999 /arch/powerpc/configs | |
parent | 51d33021425e1f905beb4208823146f2fb6517da (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/configs')
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 76736017cd34..b4398e432822 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -176,12 +176,18 @@ CONFIG_CHR_DEV_SG=y | |||
176 | CONFIG_SCSI_MULTI_LUN=y | 176 | CONFIG_SCSI_MULTI_LUN=y |
177 | CONFIG_SCSI_CONSTANTS=y | 177 | CONFIG_SCSI_CONSTANTS=y |
178 | CONFIG_SCSI_FC_ATTRS=y | 178 | CONFIG_SCSI_FC_ATTRS=y |
179 | CONFIG_SCSI_SAS_ATTRS=m | ||
180 | CONFIG_SCSI_CXGB3_ISCSI=m | ||
181 | CONFIG_SCSI_CXGB4_ISCSI=m | ||
182 | CONFIG_SCSI_BNX2_ISCSI=m | ||
183 | CONFIG_BE2ISCSI=m | ||
179 | CONFIG_SCSI_IBMVSCSI=y | 184 | CONFIG_SCSI_IBMVSCSI=y |
180 | CONFIG_SCSI_IBMVFC=m | 185 | CONFIG_SCSI_IBMVFC=m |
181 | CONFIG_SCSI_SYM53C8XX_2=y | 186 | CONFIG_SCSI_SYM53C8XX_2=y |
182 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 | 187 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
183 | CONFIG_SCSI_IPR=y | 188 | CONFIG_SCSI_IPR=y |
184 | CONFIG_SCSI_QLA_FC=m | 189 | CONFIG_SCSI_QLA_FC=m |
190 | CONFIG_SCSI_QLA_ISCSI=m | ||
185 | CONFIG_SCSI_LPFC=m | 191 | CONFIG_SCSI_LPFC=m |
186 | CONFIG_ATA=y | 192 | CONFIG_ATA=y |
187 | CONFIG_SATA_SIL24=y | 193 | CONFIG_SATA_SIL24=y |
@@ -235,11 +241,13 @@ CONFIG_ACENIC_OMIT_TIGON_I=y | |||
235 | CONFIG_E1000=y | 241 | CONFIG_E1000=y |
236 | CONFIG_E1000E=y | 242 | CONFIG_E1000E=y |
237 | CONFIG_TIGON3=y | 243 | CONFIG_TIGON3=y |
244 | CONFIG_BNX2=m | ||
238 | CONFIG_SPIDER_NET=m | 245 | CONFIG_SPIDER_NET=m |
239 | CONFIG_GELIC_NET=m | 246 | CONFIG_GELIC_NET=m |
240 | CONFIG_GELIC_WIRELESS=y | 247 | CONFIG_GELIC_WIRELESS=y |
241 | CONFIG_CHELSIO_T1=m | 248 | CONFIG_CHELSIO_T1=m |
242 | CONFIG_CHELSIO_T3=m | 249 | CONFIG_CHELSIO_T3=m |
250 | CONFIG_CHELSIO_T4=m | ||
243 | CONFIG_EHEA=m | 251 | CONFIG_EHEA=m |
244 | CONFIG_IXGBE=m | 252 | CONFIG_IXGBE=m |
245 | CONFIG_IXGB=m | 253 | CONFIG_IXGB=m |
@@ -248,6 +256,8 @@ CONFIG_MYRI10GE=m | |||
248 | CONFIG_NETXEN_NIC=m | 256 | CONFIG_NETXEN_NIC=m |
249 | CONFIG_PASEMI_MAC=y | 257 | CONFIG_PASEMI_MAC=y |
250 | CONFIG_MLX4_EN=m | 258 | CONFIG_MLX4_EN=m |
259 | CONFIG_QLGE=m | ||
260 | CONFIG_BE2NET=m | ||
251 | CONFIG_ISERIES_VETH=m | 261 | CONFIG_ISERIES_VETH=m |
252 | CONFIG_PPP=m | 262 | CONFIG_PPP=m |
253 | CONFIG_PPP_ASYNC=m | 263 | CONFIG_PPP_ASYNC=m |
@@ -330,6 +340,8 @@ CONFIG_INFINIBAND_USER_MAD=m | |||
330 | CONFIG_INFINIBAND_USER_ACCESS=m | 340 | CONFIG_INFINIBAND_USER_ACCESS=m |
331 | CONFIG_INFINIBAND_MTHCA=m | 341 | CONFIG_INFINIBAND_MTHCA=m |
332 | CONFIG_INFINIBAND_EHCA=m | 342 | CONFIG_INFINIBAND_EHCA=m |
343 | CONFIG_INFINIBAND_CXGB3=m | ||
344 | CONFIG_INFINIBAND_CXGB4=m | ||
333 | CONFIG_MLX4_INFINIBAND=m | 345 | CONFIG_MLX4_INFINIBAND=m |
334 | CONFIG_INFINIBAND_IPOIB=m | 346 | CONFIG_INFINIBAND_IPOIB=m |
335 | CONFIG_INFINIBAND_IPOIB_CM=y | 347 | CONFIG_INFINIBAND_IPOIB_CM=y |