Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[linux-2.6] / drivers / usb / core / Makefile

diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile
index d5503cf0bf74c8586a5d7ed66b029014ec4b6d1f..b6078706fb939d7f1d3aeb9466f6498f8857f366 100644 (file)
--- a/drivers/usb/core/Makefile
+++ b/drivers/usb/core/Makefile
@@ -2,8 +2,9 @@
 # Makefile for USB Core files and filesystem
 #
 
-usbcore-objs   := usb.o hub.o hcd.o urb.o message.o \
-                       config.o file.o buffer.o sysfs.o devio.o
+usbcore-objs   := usb.o hub.o hcd.o urb.o message.o driver.o \
+                       config.o file.o buffer.o sysfs.o endpoint.o \
+                       devio.o notify.o generic.o quirks.o
 
 ifeq ($(CONFIG_PCI),y)
        usbcore-objs    += hcd-pci.o
@@ -14,3 +15,7 @@ ifeq ($(CONFIG_USB_DEVICEFS),y)
 endif
 
 obj-$(CONFIG_USB)      += usbcore.o
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif