--- zzzz-none-000/linux-2.4.17/drivers/usb/Config.in	2001-11-03 01:18:58.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/usb/Config.in	2004-11-24 13:23:44.000000000 +0000
@@ -4,7 +4,16 @@
 mainmenu_option next_comment
 comment 'USB support'
 
-dep_tristate 'Support for USB' CONFIG_USB $CONFIG_PCI
+# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
+# MPC850/MPC823 processors also have a non-PCI USB controller.
+if [ "$CONFIG_PCI" = "y" -o "$CONFIG_SA1111" = "y" \
+     -o "$CONFIG_MIPS_V2USB_EVM" = "y" \
+	-o "$CONFIG_8xx" = "y" -o "$CONFIG_MIPS_TITAN" = "y" ]; then
+   tristate 'Support for USB' CONFIG_USB
+else
+   define_bool CONFIG_USB n
+fi
+
 if [ "$CONFIG_USB" = "y" -o  "$CONFIG_USB" = "m" ]; then
    bool '  USB verbose debug messages' CONFIG_USB_DEBUG
 
@@ -27,7 +36,36 @@
 else
    define_bool CONFIG_USB_UHCI_ALT n
 fi
+if [ "$CONFIG_8xx" = "y" ]; then
+   dep_tristate '  MPC850/823 USB HCI support' CONFIG_USB_MPC8xx $CONFIG_USB
+   if [ "$CONFIG_USB_MPC8xx" = "n" ]; then
+      bool '  MPC850/823 USB Function (Client) support' CONFIG_USB_CLIENT_MPC8xx
+   fi
+fi
+
 dep_tristate '  OHCI (Compaq, iMacs, OPTi, SiS, ALi, ...) support' CONFIG_USB_OHCI $CONFIG_USB
+if [ "$CONFIG_SA1111" = "y" ]; then
+   dep_tristate '    SA1111 OHCI-compatible host interface support' CONFIG_USB_OHCI_SA1111 $CONFIG_USB_OHCI
+fi
+dep_tristate '    Non-PCI OHCI support' CONFIG_USB_NON_PCI_OHCI $CONFIG_USB_OHCI
+
+if [ "$CONFIG_USB_NON_PCI_OHCI" != "y" ]; then
+	dep_tristate '    PSP Onboard Non-PCI OHCI Controller' CONFIG_USB_PSP_HOST11 $CONFIG_USB_OHCI
+	if [ "$CONFIG_USB_PSP_HOST11" != "n" ]; then
+		if [ "$CONFIG_MIPS_V2USB_EVM" = "y" -a "$CONFIG_MIPS_TITAN" = "y" ]; then
+		choice ' OHCI Controller Bus' \
+		 "VBUS  CONFIG_USB_PSP_HOST11_VBUS \
+		  VLYNQ CONFIG_USB_PSP_HOST11_VLYNQ" VBUS
+		else 
+			if [ "$CONFIG_MIPS_V2USB_EVM" = "y" ]; then
+				define_bool CONFIG_USB_PSP_HOST11_VLYNQ y
+			else 
+				define_bool CONFIG_USB_PSP_HOST11_VBUS y
+			fi
+        
+        fi
+	fi
+fi	
 
 comment 'USB Device Class drivers'
 dep_tristate '  USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
@@ -72,6 +110,7 @@
    dep_tristate '  USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB $CONFIG_VIDEO_DEV
    dep_tristate '  USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
    dep_tristate '  USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB $CONFIG_VIDEO_DEV
+   dep_tristate '  USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV
    dep_tristate '  D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
    dep_tristate '  DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
 fi