git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
jornada720_defconfig
diff --git
a/arch/arm/configs/jornada720_defconfig
b/arch/arm/configs/jornada720_defconfig
index
81fadaf
..
f3074e4
100644
(file)
--- a/
arch/arm/configs/jornada720_defconfig
+++ b/
arch/arm/configs/jornada720_defconfig
@@
-178,7
+178,6
@@
CONFIG_DMABOUNCE=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=y
CONFIG_SA1100_JORNADA720_SSP=y