Merge master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-2.6] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 1a49305..1fad856 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -25,6 +25,10 @@ config BLACKFIN
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config BFIN
        bool
        default y
@@ -189,7 +193,7 @@ config BFIN537_BLUETECHNIX_CM
          CM-BF537 support for EVAL- and DEV-Board.
 
 config BFIN561_BLUETECHNIX_CM
-       bool "BF561-CM"
+       bool "Bluetechnix CM-BF561"
        depends on (BF561)
        help
          CM-BF561 support for EVAL- and DEV-Board.
@@ -200,6 +204,12 @@ config BFIN561_EZKIT
        help
          BF561-EZKIT-LITE board Support.
 
+config BFIN561_TEPLA
+       bool "BF561-TEPLA"
+       depends on (BF561)
+       help
+        BF561-TEPLA board Support.
+
 config PNAV10
        bool "PNAV 1.0 board"
        depends on (BF537)
@@ -384,41 +394,6 @@ config BFIN_IDLE_LED_PIN
        default 0x08 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 2)
        default 0x10 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 3)
 
-comment "Console UART Setup"
-
-choice
-       prompt "Baud Rate"
-       default BAUD_57600
-config BAUD_9600
-       bool "9600"
-config BAUD_19200
-       bool "19200"
-config BAUD_38400
-       bool "38400"
-config BAUD_57600
-       bool "57600"
-config BAUD_115200
-       bool "115200"
-endchoice
-
-choice
-       prompt "Parity"
-       default BAUD_NO_PARITY
-config  BAUD_NO_PARITY
-       bool "No Parity"
-config  BAUD_PARITY
-       bool "Parity"
-endchoice
-
-choice
-       prompt "Stop Bits"
-       default BAUD_1_STOPBIT
-config  BAUD_1_STOPBIT
-       bool "1"
-config  BAUD_2_STOPBIT
-       bool "2"
-endchoice
-
 endmenu
 
 
@@ -560,14 +535,6 @@ endchoice
 
 source "mm/Kconfig"
 
-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.
-
 config BFIN_DMA_5XX
        bool "Enable DMA Support"
        depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561)