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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (30 commits)
  Blackfin SMC91X ethernet supporting driver: SMC91C111 LEDs are note drived in the kernel like in uboot
  Blackfin SPI driver: fix bug SPI DMA incomplete transmission
  Blackfin SPI driver: tweak spi cleanup function to match newer kernel changes
  Blackfin RTC drivers: update MAINTAINERS information
  Blackfin serial driver: decouple PARODD and CMSPAR checking from PARENB
  Blackfin serial driver: actually implement the break_ctl() function
  Blackfin serial driver: ignore framing and parity errors
  Blackfin serial driver: hook up our UARTs STP bit with userspaces CMSPAR
  Blackfin arch: move HI/LO macros into blackfin.h and punt the rest of macros.h as it includes VDSP macros we never use
  Blackfin arch: redo our linker script a bit
  Blackfin arch: make sure we initialize our L1 Data B section properly based on the linked kernel
  Blackfin arch: fix bug can not wakeup from sleep via push buttons
  Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-line
  Blackfin arch: add missing gpio.h header to fix compiling in some pm configurations
  Blackfin arch: As Mike pointed out range goes form m..MAX_BLACKFIN_GPIO -1
  Blackfin arch: fix spelling typo in output
  Blackfin arch: try to split up functions like this into smaller units according to LKML review
  Blackfin arch: add proper ENDPROC()
  Blackfin arch: move more of our startup code to .init so it can be freed once we are up and running
  Blackfin arch: unify differences between our diff head.S files -- no functional changes
  ...

1 files changed, 0 insertions, 35 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index b1b111bb2f3a..1fad8560c7af 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -394,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