diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 20:34:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 20:34:39 +0200 |
| commit | 45615e3ec10c38298c1b9780e13a884aff49bae1 (patch) | |
| tree | 9846c95af6152cbce9e7891e26f6503054e2f6b1 /drivers/usb/core/Makefile | |
| parent | 7782c08047fc44874caf1c03c153a070f9ac557a (diff) | |
| parent | 92466472c2116b93ef5ed957a559fe84b9d88c80 (diff) | |
| download | barebox-45615e3ec10c38298c1b9780e13a884aff49bae1.tar.gz barebox-45615e3ec10c38298c1b9780e13a884aff49bae1.tar.xz | |
Merge branch 'for-next/usb-host'
Conflicts:
drivers/usb/core/Makefile
Diffstat (limited to 'drivers/usb/core/Makefile')
| -rw-r--r-- | drivers/usb/core/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/core/Makefile b/drivers/usb/core/Makefile index 8002c63e50..58f6c5e027 100644 --- a/drivers/usb/core/Makefile +++ b/drivers/usb/core/Makefile @@ -1,4 +1,3 @@ - -obj-$(CONFIG_USB_HOST) += usb.o +obj-$(CONFIG_USB_HOST) += usb.o hub.o obj-$(CONFIG_USB) += common.o obj-$(CONFIG_OFDEVICE) += of.o |