projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[linux-2.6]
/
arch
/
arm
/
configs
/
shannon_defconfig
diff --git
a/arch/arm/configs/shannon_defconfig
b/arch/arm/configs/shannon_defconfig
index
d052c8f
..
984f709
100644
(file)
--- a/
arch/arm/configs/shannon_defconfig
+++ b/
arch/arm/configs/shannon_defconfig
@@
-87,7
+87,6
@@
CONFIG_ARCH_SA1100=y
# CONFIG_SA1100_COLLIE is not set
# CONFIG_SA1100_H3100 is not set
# CONFIG_SA1100_H3600 is not set
-# CONFIG_SA1100_H3800 is not set
# CONFIG_SA1100_BADGE4 is not set
# CONFIG_SA1100_JORNADA720 is not set
# CONFIG_SA1100_HACKKIT is not set