Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6.git] / arch / parisc / Kconfig
index 7fd696f..79a04a9 100644 (file)
@@ -13,8 +13,12 @@ config PARISC
        select HAVE_FUNCTION_GRAPH_TRACER if 64BIT
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT
        select RTC_CLASS
-       select RTC_DRV_PARISC
+       select RTC_DRV_GENERIC
        select INIT_ALL_POSSIBLE
+       select BUG
+       select HAVE_IRQ_WORK
+       select HAVE_PERF_EVENTS
+       select GENERIC_ATOMIC64 if !64BIT
        help
          The PA-RISC microprocessor is designed by Hewlett-Packard and used
          in many of their workstations & servers (HP9000 700 and 800 series,
@@ -63,10 +67,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
-config GENERIC_TIME
-       bool
-       default y
-
 config TIME_LOW_RES
        bool
        depends on SMP
@@ -92,6 +92,12 @@ config PM
 config STACKTRACE_SUPPORT
        def_bool y
 
+config NEED_DMA_MAP_STATE
+       def_bool y
+
+config NEED_SG_DMA_LENGTH
+       def_bool y
+
 config ISA_DMA_API
        bool