[Gc-linux-cvs] linux/drivers Kconfig,1.4,1.5 Makefile,1.27,1.28

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

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

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/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Makefile	1 Feb 2009 18:29:35 -0000	1.27
--- Makefile	2 Mar 2009 19:26:37 -0000	1.28
***************
*** 19,22 ****
--- 19,25 ----
  obj-$(CONFIG_XEN)		+= xen/
  
+ # regulators early, since some subsystems rely on them to initialize
+ obj-$(CONFIG_REGULATOR)		+= regulator/
+ 
  # char/ comes before serial/ etc so that the VT console is the boot-time
  # default.
***************
*** 58,61 ****
--- 61,65 ----
  obj-$(CONFIG_TC)		+= tc/
  obj-$(CONFIG_UWB)		+= uwb/
+ obj-$(CONFIG_USB_OTG_UTILS)	+= usb/otg/
  obj-$(CONFIG_USB)		+= usb/
  obj-$(CONFIG_USB_MUSB_HDRC)	+= usb/musb/
***************
*** 103,106 ****
  obj-$(CONFIG_SSB)		+= ssb/
  obj-$(CONFIG_VIRTIO)		+= virtio/
- obj-$(CONFIG_REGULATOR)		+= regulator/
  obj-$(CONFIG_STAGING)		+= staging/
--- 107,110 ----
  obj-$(CONFIG_SSB)		+= ssb/
  obj-$(CONFIG_VIRTIO)		+= virtio/
  obj-$(CONFIG_STAGING)		+= staging/
+ obj-y				+= platform/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/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
***************
*** 110,112 ****
--- 110,114 ----
  
  source "drivers/staging/Kconfig"
+ 
+ source "drivers/platform/Kconfig"
  endmenu