--- zzzz-none-000/linux-2.4.17/drivers/char/Config.in	2001-11-12 17:34:16.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/char/Config.in	2004-11-24 13:23:21.000000000 +0000
@@ -19,7 +19,7 @@
 if [ "$CONFIG_ACPI" = "y" ]; then
    bool '  Support for serial ports defined by ACPI tables' CONFIG_SERIAL_ACPI
 fi
-dep_mbool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED $CONFIG_SERIAL
+#dep_mbool 'Extended dumb serial driver options' CONFIG_SERIAL_EXTENDED $CONFIG_SERIAL
 if [ "$CONFIG_SERIAL_EXTENDED" = "y" ]; then
    bool '  Support more than 4 serial ports' CONFIG_SERIAL_MANY_PORTS
    bool '  Support for sharing serial interrupts' CONFIG_SERIAL_SHARE_IRQ
@@ -27,6 +27,12 @@
    bool '  Support special multiport boards' CONFIG_SERIAL_MULTIPORT
    bool '  Support the Bell Technologies HUB6 card' CONFIG_HUB6
 fi
+
+
+if [ "$CONFIG_MIPS_SANGAM" = "y" ]; then
+   tristate 'Enable LED support' CONFIG_MIPS_AVALANCHE_LED
+fi
+
 bool 'Non-standard serial port support' CONFIG_SERIAL_NONSTANDARD
 if [ "$CONFIG_SERIAL_NONSTANDARD" = "y" ]; then
    tristate '  Computone IntelliPort Plus serial support' CONFIG_COMPUTONE
@@ -66,12 +72,30 @@
      bool '  TMPTX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912
      dep_bool '     Console on TMPTX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912
      bool '  Enable Au1000 UART Support' CONFIG_AU1000_UART
+     
+     
+
      if [ "$CONFIG_AU1000_UART" = "y" ]; then
          bool '        Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE
      fi
+     bool 'TXx927 SIO support' CONFIG_TXX927_SERIAL 
+     if [ "$CONFIG_TXX927_SERIAL" = "y" ]; then
+        bool 'TXx927 SIO Console support' CONFIG_TXX927_SERIAL_CONSOLE  
+     fi                             
+     if [ "$CONFIG_SIBYTE_SB1250" = "y" ]; then
+        bool '  Support for sb1250 onchip DUART' CONFIG_SIBYTE_SB1250_DUART
+        if [ "$CONFIG_SIBYTE_SB1250_DUART" = "y" ]; then
+  	  bool '  Console on SB1250 DUART' CONFIG_SIBYTE_SB1250_DUART_CONSOLE
+  	  if [ "$CONFIG_SIBYTE_SB1250_DUART_CONSOLE" = "y" ]; then
+  	    define_bool CONFIG_SERIAL_CONSOLE y
+  	  fi
+  	  int  '  Output buffers size (in bytes)' CONFIG_SB1250_DUART_OUTPUT_BUF_SIZE 1024
+  	  bool '  Leave port 1 alone (for kgdb or audio)' CONFIG_SIBYTE_SB1250_DUART_NO_PORT_1
+        fi
+     fi
    fi
 fi
-if [ "$CONFIG_IT8712" = "y" ]; then
+if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
    bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
    if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then
      define_bool CONFIG_IT8172_CIR y
@@ -81,18 +105,28 @@
    bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0
    bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1
 fi
+if [ "$CONFIG_MIPS_IVR" = "y" ]; then
+   bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
+   if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then
+     define_bool CONFIG_IT8172_CIR y
+   fi
+   bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0
+fi
+if [ "$CONFIG_VR4122" = "y" -o "$CONFIG_VR4131" = "y" ]; then
+   bool 'NEC VRC4173 support' CONFIG_VRC4173
+   if [ "$CONFIG_VRC4173" != "n" ]; then
+     bool '    Enable PS/2 Unit Support' CONFIG_VRC4173_PS2U
+     bool '    Enable Touch Panel Interface Unit Support' CONFIG_VRC4173_PIU
+   fi
+fi
 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_ZORRO" = "y" ]; then
    tristate 'Commodore A2232 serial support (EXPERIMENTAL)' CONFIG_A2232
 fi
-if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then
-   bool 'DC21285 serial port support' CONFIG_SERIAL_21285
-   if [ "$CONFIG_SERIAL_21285" = "y" ]; then
-      if [ "$CONFIG_OBSOLETE" = "y" ]; then
-         bool '  Use /dev/ttyS0 device (OBSOLETE)' CONFIG_SERIAL_21285_OLD
-      fi
-      bool '  Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE
-   fi
+
+if [ "$CONFIG_SERIAL" = "n" ]; then
+   source ./drivers/serial/Config.in
 fi
+
 bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
 if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
    int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
@@ -104,8 +138,63 @@
    fi
    dep_tristate 'Support for user-space parallel port device drivers' CONFIG_PPDEV $CONFIG_PARPORT
 fi
+if [ "$CONFIG_SA1100_PFS168" = "y" ]; then
+   dep_tristate 'PFS-168 SPI char device driver' CONFIG_PFS168_SPI $CONFIG_SA1100_PFS168
+   dep_tristate 'PFS-168 Miscellaneous I/O access via proc' CONFIG_PFS168_MISC $CONFIG_SA1100_PFS168
+fi
+if [ "$CONFIG_SA1100_H3XXX" = "y" ]; then
+   comment 'Compaq iPAQ H3600 support'
+   dep_tristate '  Toucnscreen support' CONFIG_TOUCHSCREEN_H3600 $CONFIG_H3600_HARDWARE
+   dep_tristate '  Backpaq FPGA driver interface' CONFIG_H3600_BACKPAQ_FPGA $CONFIG_MERCURY_BACKPAQ
+   dep_tristate '  Backpaq accelerometer interface' CONFIG_H3600_BACKPAQ_ACCEL $CONFIG_H3600_BACKPAQ_FPGA
+   dep_tristate '  Backpaq gasgauge interface' CONFIG_H3600_BACKPAQ_GASGAUGE $CONFIG_H3600_BACKPAQ_FPGA
+   tristate '  Stowaway keyboard support' CONFIG_H3600_STOWAWAY
+   tristate 'Linux Consumer IR Driver (LIRC) for iPAQ' CONFIG_SA1100_LIRC
+fi
+
+
+if [ "$CONFIG_MIPS_TITAN" = "y" ]; then 
+  tristate 'Support for TI Keypad driver' CONFIG_MIPS_AVALANCHE_KEYPAD
+  tristate 'Support for TI LCD driver' CONFIG_MIPS_AVALANCHE_LCD
+fi
+
+                                                                                         
+if [ "$CONFIG_MIPS_AR7WRD" = "y" -o "$CONFIG_MIPS_AR7VWI" = "y" -o "$CONFIG_MIPS_AR7WI" = "y" -o "$CONFIG_MIPS_AR7V" = "y" ]; then
+  tristate 'Support for TI Marvell Switch driver' CONFIG_MIPS_AVALANCHE_MARVELL
+fi
+
+                                                                                               
+#############################################################################
+# VLYNQ driver 
+#############################################################################
+if [ "$CONFIG_MIPS_SANGAM" = "y" -o "$CONFIG_MIPS_TITAN" = "y" ]; then  
+   tristate 'VLYNQ support for the TI SOC' CONFIG_MIPS_AVALANCHE_VLYNQ 
+   bool 'VLYNQ clock source Interal' CONFIG_AVALANCHE_VLYNQ_CLK_LOCAL      
+                   
+   define_int CONFIG_MIPS_AVALANCHE_VLYNQ_PORTS 2 
+fi                                                                                             
+
+if [ "$CONFIG_MIPS_PUMAS" = "y" ]; then
+   tristate 'VLYNQ support for the TI SOC' CONFIG_MIPS_AVALANCHE_VLYNQ 
+   bool 'VLYNQ clock source Interal' CONFIG_AVALANCHE_VLYNQ_CLK_LOCAL      
+   define_int CONFIG_MIPS_AVALANCHE_VLYNQ_PORTS 1
+fi
+
+#############################################################################
+# V2USB Support 
+#############################################################################
+if [ "$CONFIG_MIPS_AVALANCHE_VLYNQ" = "y" -o "$CONFIG_MIPS_AVALANCHE_VLYNQ" = "m" ]; then
+   bool 'Support for V2USB EVM' CONFIG_MIPS_V2USB_EVM 
+fi
+
+source ./drivers/i2c/Config.in
+
+if [ "$CONFIG_ARM" = "y" ]; then
+   # This has dependencies on I2C and therefore_must_ come after I2C.
+   source ./drivers/l3/Config.in
+fi
 
-source drivers/i2c/Config.in
+source ./drivers/sensors/Config.in
 
 mainmenu_option next_comment
 comment 'Mice'
@@ -125,9 +214,13 @@
    tristate '  C&T 82C710 mouse port support (as on TI Travelmate)' CONFIG_82C710_MOUSE
    tristate '  PC110 digitizer pad support' CONFIG_PC110_PAD
 fi
+
+if [ "$CONFIG_PPC" = "y" ]; then
+	tristate 'Redwood IR mouse driver' CONFIG_RWMOUSE
+fi
 endmenu
 
-source drivers/char/joystick/Config.in
+source ./drivers/char/joystick/Config.in
 
 tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
 if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
@@ -158,11 +251,10 @@
    tristate '  Berkshire Products PC Watchdog' CONFIG_PCWATCHDOG
    tristate '  Acquire SBC Watchdog Timer' CONFIG_ACQUIRE_WDT
    tristate '  Advantech SBC Watchdog Timer' CONFIG_ADVANTECH_WDT
-   if [ "$CONFIG_FOOTBRIDGE" = "y" ]; then
-      tristate '  DC21285 watchdog' CONFIG_21285_WATCHDOG
-      if [ "$CONFIG_ARCH_NETWINDER" = "y" ]; then
-         tristate '  NetWinder WB83C977 watchdog' CONFIG_977_WATCHDOG
-      fi
+   if [ "$CONFIG_ARM" = "y" ]; then
+      dep_tristate '  DC21285 watchdog' CONFIG_21285_WATCHDOG $CONFIG_FOOTBRIDGE
+      dep_tristate '  NetWinder WB83C977 watchdog' CONFIG_977_WATCHDOG $CONFIG_ARCH_NETWINDER
+      dep_tristate '  SA1100 watchdog' CONFIG_SA1100_WATCHDOG $CONFIG_ARCH_SA1100
    fi
    tristate '  Eurotech CPU-1220/1410 Watchdog Timer' CONFIG_EUROTECH_WDT
    tristate '  IB700 SBC Watchdog Timer' CONFIG_IB700_WDT
@@ -171,6 +263,10 @@
    tristate '  SBC-60XX Watchdog Timer' CONFIG_60XX_WDT
    tristate '  W83877F (EMACS) Watchdog Timer' CONFIG_W83877F_WDT
    tristate '  ZF MachZ Watchdog' CONFIG_MACHZ_WDT
+   if [ "$CONFIG_4xx" = "y" ]; then
+      tristate '  IBM PPC 405 Watchdog Timer' CONFIG_PPC405_WDT
+   fi
+   dep_tristate '  NEC VR41xx Watchdog (DSU)' CONFIG_VR41XX_WDT $CONFIG_CPU_VR41XX
 fi
 endmenu
 
@@ -192,6 +288,12 @@
 if [ "$CONFIG_OBSOLETE" = "y" -a "$CONFIG_ALPHA_BOOK1" = "y" ]; then
    bool 'Tadpole ANA H8 Support'  CONFIG_H8
 fi
+if [ "$CONFIG_MIPS" = "y" -a "$CONFIG_NEW_TIME_C" = "y" ]; then
+   tristate 'Generic MIPS RTC Support' CONFIG_MIPS_RTC
+fi
+if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
+   tristate 'SA1100 Real Time Clock' CONFIG_SA1100_RTC
+fi
 
 tristate 'Double Talk PC internal speech card support' CONFIG_DTLK
 tristate 'Siemens R3964 line discipline' CONFIG_R3964
@@ -199,12 +301,15 @@
 if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_X86" = "y" ]; then
    dep_tristate 'Sony Vaio Programmable I/O Control Device support' CONFIG_SONYPI $CONFIG_PCI
 fi
+if [ "$CONFIG_405GP" = "y" ]; then
+   tristate 'IBM PPC 405 GPIO' CONFIG_PPC405_GPIO
+fi
 
 mainmenu_option next_comment
 comment 'Ftape, the floppy tape device driver'
 tristate 'Ftape (QIC-80/Travan) support' CONFIG_FTAPE
 if [ "$CONFIG_FTAPE" != "n" ]; then
-   source drivers/char/ftape/Config.in
+   source ./drivers/char/ftape/Config.in
 fi
 endmenu
 
@@ -219,14 +324,24 @@
    bool '  Serverworks LE/HE support' CONFIG_AGP_SWORKS
 fi
 
-source drivers/char/drm/Config.in
+# source ./drivers/char/drm/Config.in
 
 if [ "$CONFIG_HOTPLUG" = "y" -a "$CONFIG_PCMCIA" != "n" ]; then
-   source drivers/char/pcmcia/Config.in
+   source ./drivers/char/pcmcia/Config.in
+fi
+if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
+   tristate ' Alchemy Au1000 GPIO device support' CONFIG_AU1000_GPIO
+fi
+if [ "$CONFIG_MIPS_ITE8172" = "y" ]; then
+  tristate ' ITE GPIO' CONFIG_ITE_GPIO
 fi
 
 if [ "$CONFIG_X86" = "y" ]; then
    tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
 fi
 
+
+tristate 'AVM Event device support' CONFIG_AVM_EVENT
+tristate 'AVM UBIK2 device support' CONFIG_UBIK2
+
 endmenu