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 | |
| parent | dba5baf32887f58414ed7183a95309686894eab2 (diff) | |
| parent | 739253765ed55742431866b19330fa0e1012c417 (diff) | |
| download | talos-op-linux-786d3693f46579c7cd982e65de9f43eba94e4a57.tar.gz talos-op-linux-786d3693f46579c7cd982e65de9f43eba94e4a57.zip | |
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')
| -rw-r--r-- | arch/powerpc/platforms/40x/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 8 | ||||
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig index 47b3b0a3864a..8f6699fcc145 100644 --- a/arch/powerpc/platforms/40x/Kconfig +++ b/arch/powerpc/platforms/40x/Kconfig @@ -100,6 +100,7 @@ config 405GP bool select IBM405_ERR77 select IBM405_ERR51 + select IBM_NEW_EMAC_ZMII config 405EP bool diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 51f3ea40a285..8390cc164135 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 diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 3c7325ec36ec..99684ea606af 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -48,6 +48,7 @@ config 44x bool "AMCC 44x" select PPC_DCR_NATIVE select WANT_DEVICE_TREE + select PPC_UDBG_16550 config E200 bool "Freescale e200" |
