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 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
xtensa
/
configs
/
s6105_defconfig
diff --git
a/arch/xtensa/configs/s6105_defconfig
b/arch/xtensa/configs/s6105_defconfig
index
4891abb
..
550e8ed
100644
(file)
--- a/
arch/xtensa/configs/s6105_defconfig
+++ b/
arch/xtensa/configs/s6105_defconfig
@@
-15,7
+15,6
@@
CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_NO_IOPORT=y
CONFIG_HZ=100
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_NO_IOPORT=y
CONFIG_HZ=100
-CONFIG_GENERIC_TIME=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#