Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

This commit is contained in:
Paul Mackerras
2007-10-23 22:20:51 +10:00
11 changed files with 230 additions and 146 deletions

View File

@@ -100,6 +100,7 @@ config 405GP
bool
select IBM405_ERR77
select IBM405_ERR51
select IBM_NEW_EMAC_ZMII
config 405EP
bool

View File

@@ -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

View File

@@ -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"