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 'master' of git://git.infradead.org/users/linville/wireless-next into...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
40x
/
Kconfig
diff --git
a/arch/powerpc/platforms/40x/Kconfig
b/arch/powerpc/platforms/40x/Kconfig
index
d733d7c
..
b5d8706
100644
(file)
--- a/
arch/powerpc/platforms/40x/Kconfig
+++ b/
arch/powerpc/platforms/40x/Kconfig
@@
-130,21
+130,21
@@
config 405GP
bool
select IBM405_ERR77
select IBM405_ERR51
bool
select IBM405_ERR77
select IBM405_ERR51
- select IBM_
NEW_
EMAC_ZMII
+ select IBM_EMAC_ZMII
config 405EP
bool
config 405EX
bool
config 405EP
bool
config 405EX
bool
- select IBM_
NEW_
EMAC_EMAC4
- select IBM_
NEW_
EMAC_RGMII
+ select IBM_EMAC_EMAC4
+ select IBM_EMAC_RGMII
config 405EZ
bool
config 405EZ
bool
- select IBM_
NEW_
EMAC_NO_FLOW_CTRL
- select IBM_
NEW_
EMAC_MAL_CLR_ICINTSTAT
- select IBM_
NEW_
EMAC_MAL_COMMON_ERR
+ select IBM_EMAC_NO_FLOW_CTRL
+ select IBM_EMAC_MAL_CLR_ICINTSTAT
+ select IBM_EMAC_MAL_COMMON_ERR
config 405GPR
bool
config 405GPR
bool