git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
hackkit_defconfig
diff --git
a/arch/arm/configs/hackkit_defconfig
b/arch/arm/configs/hackkit_defconfig
index 1c8fb89a6730c55387cdafc169b0afb72e29dc62..db0708d5cbead9fc7c86db2d19da4dc4f1822b81 100644
(file)
--- a/
arch/arm/configs/hackkit_defconfig
+++ b/
arch/arm/configs/hackkit_defconfig
@@
-91,7
+91,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=y