diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-14 16:46:50 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-14 16:46:50 +1100 |
| commit | 280bb6b1f76aaec29a721b1025ec5d69afba57e8 (patch) | |
| tree | 769284bd2000bb80e49a6d23df61e3fedc947c64 /arch/powerpc/configs/mpc8272_ads_defconfig | |
| 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/mpc8272_ads_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc8272_ads_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index a31b7a030a6..5eae305215d 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.24-rc4 -# Thu Dec 6 16:48:30 2007 +# Linux kernel version: 2.6.24-rc5 +# Thu Dec 13 22:40:57 2007 # # CONFIG_PPC64 is not set @@ -491,7 +491,7 @@ CONFIG_MII=y CONFIG_FS_ENET=y # CONFIG_FS_ENET_HAS_SCC is not set CONFIG_FS_ENET_HAS_FCC=y -# CONFIG_FS_ENET_MDIO_FCC is not set +CONFIG_FS_ENET_MDIO_FCC=y CONFIG_NETDEV_1000=y # CONFIG_ACENIC is not set # CONFIG_DL2K is not set |