diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-23 22:20:51 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-23 22:20:51 +1000 |
| commit | 786d3693f46579c7cd982e65de9f43eba94e4a57 (patch) | |
| tree | e794415702e30899fd7181072e8753bb8068cce2 /arch/powerpc/platforms/44x/Kconfig | |
| parent | dba5baf32887f58414ed7183a95309686894eab2 (diff) | |
| parent | 739253765ed55742431866b19330fa0e1012c417 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc/platforms/44x/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 51f3ea40a28..8390cc16413 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -43,14 +43,14 @@ config 440EP bool select PPC_FPU select IBM440EP_ERR42 -# select IBM_NEW_EMAC_ZMII + select IBM_NEW_EMAC_ZMII config 440EPX bool select PPC_FPU -# Disabled until the new EMAC Driver is merged. -# select IBM_NEW_EMAC_EMAC4 -# select IBM_NEW_EMAC_ZMII + select IBM_NEW_EMAC_EMAC4 + select IBM_NEW_EMAC_RGMII + select IBM_NEW_EMAC_ZMII config 440GP bool |