Merge branch 'parisc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[~shefty/rdma-dev.git] / arch / parisc / Kconfig
index af48d26..7f9b3c5 100644 (file)
@@ -9,20 +9,19 @@ config PARISC
        select RTC_DRV_GENERIC
        select INIT_ALL_POSSIBLE
        select BUG
-       select HAVE_IRQ_WORK
        select HAVE_PERF_EVENTS
        select GENERIC_ATOMIC64 if !64BIT
        select HAVE_GENERIC_HARDIRQS
        select BROKEN_RODATA
        select GENERIC_IRQ_PROBE
        select GENERIC_PCI_IOMAP
-       select IRQ_PER_CPU
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_STRNCPY_FROM_USER
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
        select CLONE_BACKWARDS
+       select TTY # Needed for pdc_cons.c
 
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
@@ -211,12 +210,12 @@ config PARISC_PAGE_SIZE_4KB
          If you don't know what to do, choose 4KB.
 
 config PARISC_PAGE_SIZE_16KB
-       bool "16KB (EXPERIMENTAL)"
-       depends on PA8X00 && EXPERIMENTAL
+       bool "16KB"
+       depends on PA8X00
 
 config PARISC_PAGE_SIZE_64KB
-       bool "64KB (EXPERIMENTAL)"
-       depends on PA8X00 && EXPERIMENTAL
+       bool "64KB"
+       depends on PA8X00
 
 endchoice