diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-12 23:53:34 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-12 23:53:34 -0700 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /arch/mn10300/Kconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
| download | talos-obmc-linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.gz talos-obmc-linux-c170093d31bd4e3bc51881cc0f123beeca7872c9.zip | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'arch/mn10300/Kconfig')
| -rw-r--r-- | arch/mn10300/Kconfig | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 8ed41cf2b08d..243bfa23fd58 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig @@ -1,6 +1,7 @@ config MN10300 def_bool y select HAVE_OPROFILE + select GENERIC_HARDIRQS config AM33_2 def_bool n @@ -34,9 +35,6 @@ config RWSEM_GENERIC_SPINLOCK config RWSEM_XCHGADD_ALGORITHM bool -config GENERIC_HARDIRQS_NO__DO_IRQ - def_bool y - config GENERIC_CALIBRATE_DELAY def_bool y @@ -79,10 +77,6 @@ config QUICKLIST config ARCH_HAS_ILOG2_U32 def_bool y -# Use the generic interrupt handling code in kernel/irq/ -config GENERIC_HARDIRQS - def_bool y - config HOTPLUG_CPU def_bool n |
