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:
@@ -100,6 +100,7 @@ config 405GP
|
||||
bool
|
||||
select IBM405_ERR77
|
||||
select IBM405_ERR51
|
||||
select IBM_NEW_EMAC_ZMII
|
||||
|
||||
config 405EP
|
||||
bool
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user