projects
/
firefly-linux-kernel-4.4.55.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.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
platforms
/
44x
/
Kconfig
diff --git
a/arch/powerpc/platforms/44x/Kconfig
b/arch/powerpc/platforms/44x/Kconfig
index f28acdcbd6c9234ef3917dc37256f10f07e5ee11..51f3ea40a285be0c24e3aadd1a24034a34857742 100644
(file)
--- a/
arch/powerpc/platforms/44x/Kconfig
+++ b/
arch/powerpc/platforms/44x/Kconfig
@@
-54,8
+54,7
@@
config 440EPX
config 440GP
bool
-# Disabled until the new EMAC Driver is merged.
-# select IBM_NEW_EMAC_ZMII
+ select IBM_NEW_EMAC_ZMII
config 440GX
bool