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] Fix wreckage after removal of tickadj; convert to GENERIC_TIME.
  [MIPS] DECstation defconfig update
  [MIPS] Fix size of zones_size and zholes_size array
  [MIPS] BCM1480: Mask pending interrupts against c0_status.im.
  [MIPS] SB1250: Interrupt handler fixes
  [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support.
  [MIPS] Remove Atlas and SEAD from feature-removal-schedule.
  [MIPS] Remove Jaguar and Ocelot family from feature list.
  [MIPS] BCM1250: TRDY timeout tweaks for Broadcom SiByte systems
  [MIPS] Remove dead DECstation boot code
  [MIPS] Let gcc align 'struct pt_regs' on 8 bytes boundary

1 files changed, 0 insertions, 30 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index bde1c665d9f4..0e6f35fcc2eb 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -371,36 +371,6 @@ config AU1000_SERIAL_CONSOLE
           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 QTRONIX_KEYBOARD
-        bool "Enable Qtronix 990P Keyboard Support"
-        depends on IT8712
-        help
-          Images of Qtronix keyboards are at
-          <http://www.qtronix.com/keyboard.html>.
-
-config IT8172_CIR
-        bool
-        depends on QTRONIX_KEYBOARD
-        default y
-
-config IT8172_SCR0
-        bool "Enable Smart Card Reader 0 Support "
-        depends on IT8712
-        help
-          Say Y here to support smart-card reader 0 (SCR0) on the Integrated
-          Technology Express, Inc. ITE8172 SBC.  Vendor page at
-          <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-          board at <http://www.mvista.com/partners/semiconductor/ite.html>.
-
-config IT8172_SCR1
-        bool "Enable Smart Card Reader 1 Support "
-        depends on IT8712
-        help
-          Say Y here to support smart-card reader 1 (SCR1) on the Integrated
-          Technology Express, Inc. ITE8172 SBC.  Vendor page at
-          <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-          board at <http://www.mvista.com/partners/semiconductor/ite.html>.
-
 config A2232
         tristate "Commodore A2232 serial support (EXPERIMENTAL)"
         depends on EXPERIMENTAL && ZORRO && BROKEN_ON_SMP