Merge branch 'master' into h8300

[uclinux-h8/linux.git] / arch / h8300 / Kconfig

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 336e76d..ab78325 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -2,18 +2,22 @@ config H8300
        bool
        default y
        select HAVE_IDE
-       select HAVE_GENERIC_HARDIRQS
        select GENERIC_ATOMIC64
        select HAVE_UID16
        select VIRT_TO_BUS
        select ARCH_WANT_IPC_PARSE_VERSION
        select GENERIC_IRQ_SHOW
+       select ARCH_WANT_FRAME_POINTER
        select GENERIC_CPU_DEVICES
        select MODULES_USE_ELF_RELA
+<<<<<<< HEAD
+       select GENERIC_CLOCKEVENTS
+=======
        select OLD_SIGSUSPEND3
        select OLD_SIGACTION
        select HAVE_UNDERSCORE_SYMBOL_PREFIX
        select FRAME_POINTER
+>>>>>>> master
 
 config MMU
        bool
@@ -81,6 +85,10 @@ config HZ
        int
        default 100
 
+config NR_CPUS
+        int
+       default 1
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"