projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
[profile/ivi/kernel-x86-ivi.git]
/
arch
/
powerpc
/
configs
/
ppc64_defconfig
diff --git
a/arch/powerpc/configs/ppc64_defconfig
b/arch/powerpc/configs/ppc64_defconfig
index
b5b2599
..
12980d5
100644
(file)
--- a/
arch/powerpc/configs/ppc64_defconfig
+++ b/
arch/powerpc/configs/ppc64_defconfig
@@
-1004,7
+1004,6
@@
CONFIG_TIGON3=y
CONFIG_SPIDER_NET=m
CONFIG_GELIC_NET=m
CONFIG_GELIC_WIRELESS=y
-# CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE is not set
# CONFIG_QLA3XXX is not set
# CONFIG_ATL1 is not set
# CONFIG_ATL1E is not set