Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / v850 / Kconfig

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index f0d4d72e560fe8e1b68700e6c87929da3239bae6..4379f43505efafe27f1c50dca47b970f3fdad3df 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,6 +10,9 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
                bool
        default n
+config ZONE_DMA
+       bool
+       default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
@@ -34,6 +37,10 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
+config GENERIC_TIME
+       bool
+       default y
+
 config TIME_LOW_RES
        bool
        default y
@@ -46,6 +53,9 @@ config ARCH_HAS_ILOG2_U64
        bool
        default n
 
+config ARCH_SUPPORTS_AOUT
+       def_bool y
+
 # Turn off some random 386 crap that can affect device config
 config ISA
        bool
@@ -68,6 +78,7 @@ config MCA
 config V850
        bool
        default y
+       select HAVE_IDE
 
 menu "Processor type and features"
 
@@ -205,6 +216,13 @@ menu "Processor type and features"
          bool
          default !V850E_CACHE && !V850E2_CACHE
 
+   # HZ depends on the platform
+   config HZ
+         int
+         default 24  if V850E_SIM || V850E2_SIM85E2
+         default 122 if V850E2_FPGA85E2C
+         default 100
+
    #### Misc config
 
    config ROM_KERNEL
@@ -214,7 +232,7 @@ menu "Processor type and features"
    # Some platforms pre-zero memory, in which case the kernel doesn't need to
    config ZERO_BSS
          bool
-         depends !V850E2_SIM85E2C
+         depends on !V850E2_SIM85E2C
          default y
 
    # The crappy-ass zone allocator requires that the start of allocatable
@@ -233,14 +251,6 @@ menu "Processor type and features"
    config RESET_GUARD
          bool "Reset Guard"
 
-   config LARGE_ALLOCS
-         bool "Allow allocating large blocks (> 1MB) of memory"
-         help
-            Allow the slab memory allocator to keep chains for very large
-            memory sizes - upto 32MB. You may need this if your system has
-            a lot of RAM, and you need to able to allocate very large
-            contiguous chunks. If unsure, say N.
-
 source "mm/Kconfig"
 
 endmenu