projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-3.12-rc1' of git://git.infradead.org/linux-ubifs
[cascardo/linux.git]
/
arch
/
xtensa
/
configs
/
s6105_defconfig
diff --git
a/arch/xtensa/configs/s6105_defconfig
b/arch/xtensa/configs/s6105_defconfig
index
4799c6a
..
d929f77
100644
(file)
--- a/
arch/xtensa/configs/s6105_defconfig
+++ b/
arch/xtensa/configs/s6105_defconfig
@@
-9,7
+9,6
@@
CONFIG_XTENSA=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_HARDIRQS=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
CONFIG_NO_IOPORT=y