git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
44x
/
Kconfig
diff --git
a/arch/powerpc/platforms/44x/Kconfig
b/arch/powerpc/platforms/44x/Kconfig
index
e958b6f
..
762322c
100644
(file)
--- a/
arch/powerpc/platforms/44x/Kconfig
+++ b/
arch/powerpc/platforms/44x/Kconfig
@@
-23,7
+23,7
@@
config BLUESTONE
default n
select PPC44x_SIMPLE
select APM821xx
default n
select PPC44x_SIMPLE
select APM821xx
- select IBM_
NEW_
EMAC_RGMII
+ select IBM_EMAC_RGMII
help
This option enables support for the APM APM821xx Evaluation board.
help
This option enables support for the APM APM821xx Evaluation board.
@@
-122,8
+122,8
@@
config CANYONLANDS
select PPC4xx_PCI_EXPRESS
select PCI_MSI
select PPC4xx_MSI
select PPC4xx_PCI_EXPRESS
select PCI_MSI
select PPC4xx_MSI
- select IBM_
NEW_
EMAC_RGMII
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_RGMII
+ select IBM_EMAC_ZMII
help
This option enables support for the AMCC PPC460EX evaluation board.
help
This option enables support for the AMCC PPC460EX evaluation board.
@@
-135,8
+135,8
@@
config GLACIER
select 460EX # Odd since it uses 460GT but the effects are the same
select PCI
select PPC4xx_PCI_EXPRESS
select 460EX # Odd since it uses 460GT but the effects are the same
select PCI
select PPC4xx_PCI_EXPRESS
- select IBM_
NEW_
EMAC_RGMII
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_RGMII
+ select IBM_EMAC_ZMII
help
This option enables support for the AMCC PPC460GT evaluation board.
help
This option enables support for the AMCC PPC460GT evaluation board.
@@
-161,7
+161,7
@@
config EIGER
select 460SX
select PCI
select PPC4xx_PCI_EXPRESS
select 460SX
select PCI
select PPC4xx_PCI_EXPRESS
- select IBM_
NEW_
EMAC_RGMII
+ select IBM_EMAC_RGMII
help
This option enables support for the AMCC PPC460SX evaluation board.
help
This option enables support for the AMCC PPC460SX evaluation board.
@@
-260,59
+260,59
@@
config 440EP
bool
select PPC_FPU
select IBM440EP_ERR42
bool
select PPC_FPU
select IBM440EP_ERR42
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_ZMII
select USB_ARCH_HAS_OHCI
config 440EPX
bool
select PPC_FPU
select USB_ARCH_HAS_OHCI
config 440EPX
bool
select PPC_FPU
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_RGMII
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_RGMII
+ select IBM_EMAC_ZMII
config 440GRX
bool
config 440GRX
bool
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_RGMII
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_RGMII
+ select IBM_EMAC_ZMII
config 440GP
bool
config 440GP
bool
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_ZMII
config 440GX
bool
config 440GX
bool
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_RGMII
- select IBM_
NEW_
EMAC_ZMII #test only
- select IBM_
NEW_
EMAC_TAH #test only
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_RGMII
+ select IBM_EMAC_ZMII #test only
+ select IBM_EMAC_TAH #test only
config 440SP
bool
config 440SPe
bool
config 440SP
bool
config 440SPe
bool
- select IBM_
NEW_
EMAC_EMAC4
+ select IBM_EMAC_EMAC4
config 460EX
bool
select PPC_FPU
config 460EX
bool
select PPC_FPU
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_TAH
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_TAH
config 460SX
bool
select PPC_FPU
config 460SX
bool
select PPC_FPU
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_RGMII
- select IBM_
NEW_
EMAC_ZMII
- select IBM_
NEW_
EMAC_TAH
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_RGMII
+ select IBM_EMAC_ZMII
+ select IBM_EMAC_TAH
config APM821xx
bool
select PPC_FPU
config APM821xx
bool
select PPC_FPU
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_TAH
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_TAH
# 44x errata/workaround config symbols, selected by the CPU models above
config IBM440EP_ERR42
# 44x errata/workaround config symbols, selected by the CPU models above
config IBM440EP_ERR42