[Gc-linux-cvs] linux/drivers/usb Kconfig,1.4,1.5 Makefile,1.3,1.4

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/usb
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/drivers/usb

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	1 Feb 2009 18:29:35 -0000	1.3
--- Makefile	2 Mar 2009 19:26:37 -0000	1.4
***************
*** 12,17 ****
--- 12,19 ----
  obj-$(CONFIG_USB_EHCI_HCD)	+= host/
  obj-$(CONFIG_USB_ISP116X_HCD)	+= host/
+ obj-$(CONFIG_USB_ISP1760_HCD)	+= host/
  obj-$(CONFIG_USB_OHCI_HCD)	+= host/
  obj-$(CONFIG_USB_UHCI_HCD)	+= host/
+ obj-$(CONFIG_USB_FHCI_HCD)	+= host/
  obj-$(CONFIG_USB_SL811_HCD)	+= host/
  obj-$(CONFIG_USB_U132_HCD)	+= host/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/usb/Kconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Kconfig	1 Feb 2009 18:29:35 -0000	1.4
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.5
***************
*** 152,154 ****
--- 152,156 ----
  source "drivers/usb/gadget/Kconfig"
  
+ source "drivers/usb/otg/Kconfig"
+ 
  endif # USB_SUPPORT