diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 09:53:34 +0300 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 09:53:34 +0300 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /arch/score/Kconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
| download | linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.xz | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/score/Kconfig')
| -rw-r--r-- | arch/score/Kconfig | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/score/Kconfig b/arch/score/Kconfig index 4293fdcb5398..27b2295f41f3 100644 --- a/arch/score/Kconfig +++ b/arch/score/Kconfig @@ -1,5 +1,9 @@ menu "Machine selection" +config SCORE + def_bool y + select HAVE_GENERIC_HARDIRQS + choice prompt "System type" default MACH_SPCT6600 @@ -53,9 +57,6 @@ config GENERIC_CLOCKEVENTS config SCHED_NO_NO_OMIT_FRAME_POINTER def_bool y -config GENERIC_HARDIRQS_NO__DO_IRQ - def_bool y - config GENERIC_SYSCALL_TABLE def_bool y @@ -68,9 +69,6 @@ menu "Kernel type" config 32BIT def_bool y -config GENERIC_HARDIRQS - def_bool y - config ARCH_FLATMEM_ENABLE def_bool y |