projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[cascardo/linux.git]
/
arch
/
powerpc
/
configs
/
ppc64e_defconfig
diff --git
a/arch/powerpc/configs/ppc64e_defconfig
b/arch/powerpc/configs/ppc64e_defconfig
index
18af460
..
8195f16
100644
(file)
--- a/
arch/powerpc/configs/ppc64e_defconfig
+++ b/
arch/powerpc/configs/ppc64e_defconfig
@@
-1008,8
+1008,8
@@
CONFIG_IXGB=m
# CONFIG_QLGE is not set
# CONFIG_SFC is not set
# CONFIG_BE2NET is not set
-CONFIG_TR=y
-CONFIG_IBMOL=y
+# CONFIG_TR is not set
+# CONFIG_IBMOL is not set
# CONFIG_3C359 is not set
# CONFIG_TMS380TR is not set
CONFIG_WLAN=y