--- zzzz-none-000/linux-2.4.17/drivers/usb/Makefile	2001-12-21 17:41:55.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/usb/Makefile	2004-11-24 13:23:42.000000000 +0000
@@ -14,16 +14,30 @@
 
 # Multipart objects.
 
-list-multi		:= usbcore.o hid.o
+#list-multi		:= usbcore.o hid.o usb-ohci-psp.o
+
+list-multi		:= usbcore.o hid.o usbohcicore.o
 usbcore-objs		:= usb.o usb-debug.o hub.o
 hid-objs		:= hid-core.o hid-input.o
+usbohcicore-objs        := usb-ohci.o
+#usb-ohci-psp-objs       := psp-usb-ohci.o psp-usb-host-config.o
 
 ifneq ($(CONFIG_USB_PWC),n)
 	export-objs		+= pwc-uncompress.o
 	list-multi		+= pwc.o
 endif
 
+ifneq ($(CONFIG_USB_VICAM),n)
+	export-objs		+= usbvideo.o
+endif
+	
+ifneq ($(CONFIG_USB_PSP_HOST11),n)
+	usbohcicore-objs	+=  psp-usb-ohci.o psp-usb-host-config.o
+endif
+
+
 pwc-objs		:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
+vicam-objs		:= vicam.o usbvideo.o
 
 
 # Optional parts of multipart objects.
@@ -32,6 +46,9 @@
 	usbcore-objs	+= devio.o inode.o drivers.o devices.o
 endif
 
+
+      
+
 ifeq ($(CONFIG_USB_HIDDEV),y)
 	hid-objs	+= hiddev.o
 endif
@@ -48,8 +65,11 @@
 obj-$(CONFIG_USB)		+= usbcore.o
 obj-$(CONFIG_USB_UHCI)		+= usb-uhci.o
 obj-$(CONFIG_USB_UHCI_ALT)	+= uhci.o
-obj-$(CONFIG_USB_OHCI)		+= usb-ohci.o
-
+obj-$(CONFIG_USB_MPC8xx)	+= m8xxhci.o
+obj-$(CONFIG_USB_OHCI)		+= usbohcicore.o
+obj-$(CONFIG_USB_OHCI_SA1111)	+= usb-ohci-sa1111.o
+obj-$(CONFIG_USB_NON_PCI_OHCI)	+= usb-ohci-nonpci.o
+#obj-$(CONFIG_USB_PSP_HOST11)    += usb-ohci-psp.o
 obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
 obj-$(CONFIG_USB_HID)		+= hid.o
 obj-$(CONFIG_USB_KBD)		+= usbkbd.o
@@ -77,6 +97,7 @@
 obj-$(CONFIG_USB_HPUSBSCSI)	+= hpusbscsi.o
 obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
 obj-$(CONFIG_USB_USBNET)	+= usbnet.o
+obj-$(CONFIG_USB_VICAM)		+= vicam.o usbvideo.o
 
 # Object files in subdirectories
 mod-subdirs	:= serial
@@ -104,3 +125,9 @@
 
 pwc.o: $(pwc-objs)
 	$(LD) -r -o $@ $(pwc-objs)
+
+usbohcicore.o: $(usbohcicore-objs)
+	$(LD) -r -o $@ $(usbohcicore-objs)
+	
+#usb-ohci-psp.o: $(usb-ohci-psp-objs)
+#	$(LD) -r -o $@ $(usb-ohci-psp-objs)