Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (46 commits)
  UIO: Fix mapping of logical and virtual memory
  UIO: add automata sercos3 pci card support
  UIO: Change driver name of uio_pdrv
  UIO: Add alignment warnings for uio-mem
  Driver core: add bus_sort_breadthfirst() function
  NET: convert the phy_device file to use bus_find_device_by_name
  kobject: Cleanup kobject_rename and !CONFIG_SYSFS
  kobject: Fix kobject_rename and !CONFIG_SYSFS
  sysfs: Make dir and name args to sysfs_notify() const
  platform: add new device registration helper
  sysfs: use ilookup5() instead of ilookup5_nowait()
  PNP: create device attributes via default device attributes
  Driver core: make bus_find_device_by_name() more robust
  usb: turn dev_warn+WARN_ON combos into dev_WARN
  debug: use dev_WARN() rather than WARN_ON() in device_pm_add()
  debug: Introduce a dev_WARN() function
  sysfs: fix deadlock
  device model: Do a quickcheck for driver binding before doing an expensive check
  Driver core: Fix cleanup in device_create_vargs().
  Driver core: Clarify device cleanup.
  ...

1 files changed, 7 insertions, 16 deletions

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index fcb5cb9094d9..2267fa0b51b2 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -22,24 +22,15 @@ obj-$(CONFIG_USB_M66592)	+= m66592-udc.o
 #
 # USB gadget drivers
 #
-C_UTILS =       composite.o usbstring.o config.o epautoconf.o
-
-g_zero-objs                     := zero.o f_sourcesink.o f_loopback.o $(C_UTILS)
-g_ether-objs                    := ether.o u_ether.o f_subset.o f_ecm.o $(C_UTILS)
-g_serial-objs                   := serial.o u_serial.o f_acm.o f_serial.o $(C_UTILS)
-g_midi-objs                     := gmidi.o usbstring.o config.o epautoconf.o
+g_zero-objs                     := zero.o
+g_ether-objs                    := ether.o
+g_serial-objs                   := serial.o
+g_midi-objs                     := gmidi.o
 gadgetfs-objs                   := inode.o
-g_file_storage-objs             := file_storage.o usbstring.o config.o \
-                                        epautoconf.o
-g_printer-objs                  := printer.o usbstring.o config.o \
-                                        epautoconf.o
-g_cdc-objs                      := cdc2.o u_ether.o f_ecm.o \
-                                        u_serial.o f_acm.o $(C_UTILS)
+g_file_storage-objs             := file_storage.o
+g_printer-objs                  := printer.o
+g_cdc-objs                      := cdc2.o
 
-ifeq ($(CONFIG_USB_ETH_RNDIS),y)
-        g_ether-objs            += f_rndis.o rndis.o
-endif
- 
 obj-$(CONFIG_USB_ZERO)          += g_zero.o
 obj-$(CONFIG_USB_ETH)           += g_ether.o
 obj-$(CONFIG_USB_GADGETFS)      += gadgetfs.o