Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Workaround for a sparse warning in include/asm-mips/mach-tx4927/ioremap.h
  [MIPS] Make show_code static and add __user tag
  [MIPS] Workaround for a sparse warning in include/asm-mips/compat.h
  [MIPS] Add some __user tags
  [MIPS] math-emu minor cleanup
  [MIPS] Kill CONFIG_TX4927BUG_WORKAROUND
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_FB_XPERT98
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_SRC_CLK
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1000_USE32K
  [MIPS] Alchemy: Remove code wrapped by dead symbol CONFIG_AU1XXX_PSC_SPI
  [CHAR] Delete leftovers of old Alchemy UART driver

1 files changed, 0 insertions, 14 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a31c6d2c061f..f6648682b43a 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -374,20 +374,6 @@ config ISTALLION
           To compile this driver as a module, choose M here: the
           module will be called istallion.
 
-config AU1000_UART
-        bool "Enable Au1000 UART Support"
-        depends on SERIAL_NONSTANDARD && MIPS
-        help
-          If you have an Alchemy AU1000 processor (MIPS based) and you want
-          to use serial ports, say Y.  Otherwise, say N.
-
-config AU1000_SERIAL_CONSOLE
-        bool "Enable Au1000 serial console"
-        depends on AU1000_UART
-        help
-          If you have an Alchemy AU1000 processor (MIPS based) and you want
-          to use a console on a serial port, say Y.  Otherwise, say N.
-
 config SERIAL_DEC
         bool "DECstation serial support"
         depends on MACH_DECSTATION