projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/netdev-jwl
[powerpc.git]
/
arch
/
arm
/
configs
/
ixp4xx_defconfig
diff --git
a/arch/arm/configs/ixp4xx_defconfig
b/arch/arm/configs/ixp4xx_defconfig
index
c279e41
..
f74c926
100644
(file)
--- a/
arch/arm/configs/ixp4xx_defconfig
+++ b/
arch/arm/configs/ixp4xx_defconfig
@@
-104,7
+104,7
@@
CONFIG_ARCH_IXCDP1100=y
CONFIG_ARCH_PRPMC1100=y
CONFIG_ARCH_IXDP4XX=y
CONFIG_CPU_IXP46X=y
-CONFIG_MACH_GTWX5715=y
+# CONFIG_MACH_GTWX5715 is not set
#
# IXP4xx Options