diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 069ae1bbac29..d4685d1c0be8 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -211,11 +211,28 @@ CONFIG_PPC_PASEMI=y | |||
211 | CONFIG_PPC_PASEMI_IOMMU=y | 211 | CONFIG_PPC_PASEMI_IOMMU=y |
212 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set | 212 | # CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE is not set |
213 | CONFIG_PPC_PASEMI_MDIO=y | 213 | CONFIG_PPC_PASEMI_MDIO=y |
214 | # CONFIG_PPC_PS3 is not set | 214 | CONFIG_PPC_PS3=y |
215 | |||
216 | # | ||
217 | # PS3 Platform Options | ||
218 | # | ||
219 | # CONFIG_PS3_ADVANCED is not set | ||
220 | CONFIG_PS3_HTAB_SIZE=20 | ||
221 | # CONFIG_PS3_DYNAMIC_DMA is not set | ||
222 | CONFIG_PS3_VUART=y | ||
223 | CONFIG_PS3_PS3AV=y | ||
224 | CONFIG_PS3_SYS_MANAGER=y | ||
225 | CONFIG_PS3_STORAGE=m | ||
226 | CONFIG_PS3_DISK=m | ||
227 | CONFIG_PS3_ROM=m | ||
228 | CONFIG_PS3_FLASH=m | ||
229 | CONFIG_PS3_LPM=m | ||
215 | CONFIG_PPC_CELL=y | 230 | CONFIG_PPC_CELL=y |
231 | CONFIG_PPC_CELL_COMMON=y | ||
216 | CONFIG_PPC_CELL_NATIVE=y | 232 | CONFIG_PPC_CELL_NATIVE=y |
217 | CONFIG_PPC_IBM_CELL_BLADE=y | 233 | CONFIG_PPC_IBM_CELL_BLADE=y |
218 | CONFIG_PPC_CELLEB=y | 234 | CONFIG_PPC_CELLEB=y |
235 | CONFIG_PPC_CELL_QPACE=y | ||
219 | 236 | ||
220 | # | 237 | # |
221 | # Cell Broadband Engine options | 238 | # Cell Broadband Engine options |
@@ -981,6 +998,9 @@ CONFIG_E1000=y | |||
981 | CONFIG_TIGON3=y | 998 | CONFIG_TIGON3=y |
982 | # CONFIG_BNX2 is not set | 999 | # CONFIG_BNX2 is not set |
983 | CONFIG_SPIDER_NET=m | 1000 | CONFIG_SPIDER_NET=m |
1001 | CONFIG_GELIC_NET=m | ||
1002 | CONFIG_GELIC_WIRELESS=y | ||
1003 | # CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set | ||
984 | # CONFIG_QLA3XXX is not set | 1004 | # CONFIG_QLA3XXX is not set |
985 | # CONFIG_ATL1 is not set | 1005 | # CONFIG_ATL1 is not set |
986 | # CONFIG_ATL1E is not set | 1006 | # CONFIG_ATL1E is not set |
@@ -1370,6 +1390,8 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
1370 | # CONFIG_FB_PM3 is not set | 1390 | # CONFIG_FB_PM3 is not set |
1371 | # CONFIG_FB_CARMINE is not set | 1391 | # CONFIG_FB_CARMINE is not set |
1372 | CONFIG_FB_IBM_GXT4500=y | 1392 | CONFIG_FB_IBM_GXT4500=y |
1393 | CONFIG_FB_PS3=m | ||
1394 | CONFIG_FB_PS3_DEFAULT_SIZE_M=9 | ||
1373 | # CONFIG_FB_VIRTUAL is not set | 1395 | # CONFIG_FB_VIRTUAL is not set |
1374 | # CONFIG_FB_METRONOME is not set | 1396 | # CONFIG_FB_METRONOME is not set |
1375 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1397 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
@@ -1492,6 +1514,8 @@ CONFIG_SND_PCI=y | |||
1492 | CONFIG_SND_PPC=y | 1514 | CONFIG_SND_PPC=y |
1493 | CONFIG_SND_POWERMAC=m | 1515 | CONFIG_SND_POWERMAC=m |
1494 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1516 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
1517 | CONFIG_SND_PS3=m | ||
1518 | CONFIG_SND_PS3_DEFAULT_START_DELAY=2000 | ||
1495 | CONFIG_SND_AOA=m | 1519 | CONFIG_SND_AOA=m |
1496 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1520 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
1497 | CONFIG_SND_AOA_ONYX=m | 1521 | CONFIG_SND_AOA_ONYX=m |