diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /drivers/usb/core/Makefile | |
| parent | [PATCH] s2io: netpoll support (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff) | |
| download | linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.xz linux-dev-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/core/Makefile')
| -rw-r--r-- | drivers/usb/core/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile index 28329ddf187c..ec510922af63 100644 --- a/drivers/usb/core/Makefile +++ b/drivers/usb/core/Makefile @@ -3,7 +3,8 @@ # usbcore-objs := usb.o hub.o hcd.o urb.o message.o driver.o \ - config.o file.o buffer.o sysfs.o devio.o notify.o + config.o file.o buffer.o sysfs.o endpoint.o \ + devio.o notify.o ifeq ($(CONFIG_PCI),y) usbcore-objs += hcd-pci.o |