diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-14 00:46:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-14 00:46:50 -0500 |
| commit | 280bb6b1f76aaec29a721b1025ec5d69afba57e8 (patch) | |
| tree | 769284bd2000bb80e49a6d23df61e3fedc947c64 /arch/powerpc/configs | |
| parent | eb8dc843fc3c0dbac553ec79d7e5b4d8339aeb3d (diff) | |
| parent | c89686210542f6946e48a907772a356b9fce03f0 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
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 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index a31b7a030a..5eae305215 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 142d206d68..a3bfbb65a9 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 |
