diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 09:04:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 09:04:58 -0700 |
| commit | 514b1923e1549162f1597f81113c0e5b72aed691 (patch) | |
| tree | b804bc621d81e022593584fc608df563c8c6b8ca /arch/hexagon/Kconfig | |
| parent | 6f73b3629f774c6cba589b15fd095112b25ca923 (diff) | |
| parent | 5042ab91c4272e158748180ae70a2e097f9e90e3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel
Pull Hexagon architecture changes from Richard Kuo:
"These are mostly cleanups and feedback remaining from the original
upstreaming."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
various Kconfig cleanup and old platform build code removal
hexagon/mm/vm_fault.c: Port OOM changes to do_page_fault
arch/hexagon/kernel/dma.c: make function static
Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h
Hexagon: Use resource_size function
Diffstat (limited to 'arch/hexagon/Kconfig')
| -rw-r--r-- | arch/hexagon/Kconfig | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 22615dd0221..bc979f77098 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -13,8 +13,8 @@ config HEXAGON # select ARCH_REQUIRE_GPIOLIB # select HAVE_CLK # select IRQ_PER_CPU - select HAVE_IRQ_WORK # select GENERIC_PENDING_IRQ if SMP + select HAVE_IRQ_WORK select GENERIC_ATOMIC64 select HAVE_PERF_EVENTS select HAVE_GENERIC_HARDIRQS @@ -26,7 +26,7 @@ config HEXAGON select NO_IOPORT select GENERIC_IOMAP select GENERIC_SMP_IDLE_THREAD - # mostly generic routines, with some accelerated ones + select STACKTRACE_SUPPORT ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications. @@ -73,15 +73,6 @@ config GENERIC_CSUM config GENERIC_IRQ_PROBE def_bool y -#config ZONE_DMA -# bool -# default y - -config HAS_DMA - bool - select HAVE_DMA_ATTRS - default y - config NEED_SG_DMA_LENGTH def_bool y @@ -114,14 +105,11 @@ config GENERIC_BUG def_bool y depends on BUG -config BUG - def_bool y - menu "Machine selection" choice prompt "System type" - default HEXAGON_ARCH_V2 + default HEXAGON_COMET config HEXAGON_COMET bool "Comet Board" @@ -194,8 +182,7 @@ source "kernel/Kconfig.hz" source "kernel/time/Kconfig" config GENERIC_GPIO - bool "Generic GPIO support" - default n + def_bool n endmenu |