diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /arch/powerpc/configs | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/mpc8272_ads_defconfig | 6 | ||||
| -rw-r--r-- | arch/powerpc/configs/pq2fads_defconfig | 6 | ||||
| -rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index a31b7a030a6b..5eae305215dc 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_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-rc5 |
| 4 | # Thu Dec 6 16:48:30 2007 | 4 | # Thu Dec 13 22:40:57 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -491,7 +491,7 @@ CONFIG_MII=y | |||
| 491 | CONFIG_FS_ENET=y | 491 | CONFIG_FS_ENET=y |
| 492 | # CONFIG_FS_ENET_HAS_SCC is not set | 492 | # CONFIG_FS_ENET_HAS_SCC is not set |
| 493 | CONFIG_FS_ENET_HAS_FCC=y | 493 | CONFIG_FS_ENET_HAS_FCC=y |
| 494 | # CONFIG_FS_ENET_MDIO_FCC is not set | 494 | CONFIG_FS_ENET_MDIO_FCC=y |
| 495 | CONFIG_NETDEV_1000=y | 495 | CONFIG_NETDEV_1000=y |
| 496 | # CONFIG_ACENIC is not set | 496 | # CONFIG_ACENIC is not set |
| 497 | # CONFIG_DL2K is not set | 497 | # CONFIG_DL2K is not set |
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index 142d206d6870..a3bfbb65a933 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_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-rc5 |
| 4 | # Thu Dec 6 16:49:09 2007 | 4 | # Thu Dec 13 22:39:18 2007 |
| 5 | # | 5 | # |
| 6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
| 7 | 7 | ||
| @@ -548,7 +548,7 @@ CONFIG_MII=y | |||
| 548 | CONFIG_FS_ENET=y | 548 | CONFIG_FS_ENET=y |
| 549 | # CONFIG_FS_ENET_HAS_SCC is not set | 549 | # CONFIG_FS_ENET_HAS_SCC is not set |
| 550 | CONFIG_FS_ENET_HAS_FCC=y | 550 | CONFIG_FS_ENET_HAS_FCC=y |
| 551 | # CONFIG_FS_ENET_MDIO_FCC is not set | 551 | CONFIG_FS_ENET_MDIO_FCC=y |
| 552 | CONFIG_NETDEV_1000=y | 552 | CONFIG_NETDEV_1000=y |
| 553 | # CONFIG_ACENIC is not set | 553 | # CONFIG_ACENIC is not set |
| 554 | # CONFIG_DL2K is not set | 554 | # CONFIG_DL2K is not set |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 5bd547ecd60a..0b5469fb6e0f 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
| @@ -157,7 +157,7 @@ CONFIG_PS3_HTAB_SIZE=20 | |||
| 157 | CONFIG_PS3_USE_LPAR_ADDR=y | 157 | CONFIG_PS3_USE_LPAR_ADDR=y |
| 158 | CONFIG_PS3_VUART=y | 158 | CONFIG_PS3_VUART=y |
| 159 | CONFIG_PS3_PS3AV=y | 159 | CONFIG_PS3_PS3AV=y |
| 160 | CONFIG_PS3_SYS_MANAGER=m | 160 | CONFIG_PS3_SYS_MANAGER=y |
| 161 | CONFIG_PS3_STORAGE=y | 161 | CONFIG_PS3_STORAGE=y |
| 162 | CONFIG_PS3_DISK=y | 162 | CONFIG_PS3_DISK=y |
| 163 | CONFIG_PS3_ROM=y | 163 | CONFIG_PS3_ROM=y |