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' into for-2.6.35
[pandora-kernel.git]
/
arch
/
powerpc
/
configs
/
ppc64_defconfig
diff --git
a/arch/powerpc/configs/ppc64_defconfig
b/arch/powerpc/configs/ppc64_defconfig
index
12980d5
..
dad617e
100644
(file)
--- a/
arch/powerpc/configs/ppc64_defconfig
+++ b/
arch/powerpc/configs/ppc64_defconfig
@@
-988,7
+988,7
@@
CONFIG_ACENIC=m
CONFIG_ACENIC_OMIT_TIGON_I=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
-CONFIG_E1000E=
m
+CONFIG_E1000E=
y
# CONFIG_IP1000 is not set
# CONFIG_IGB is not set
# CONFIG_NS83820 is not set