diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:58 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 20:34:28 +0200 |
| commit | 7782c08047fc44874caf1c03c153a070f9ac557a (patch) | |
| tree | 54ef13545a93221b2b4598822c3f3b830c2c82d4 /commands/Makefile | |
| parent | 038be0fbb5e983a498752b283319ba926f994a4b (diff) | |
| parent | 46ff98b011c86511a8585a01fa3c4fbb774c9c54 (diff) | |
| download | barebox-7782c08047fc44874caf1c03c153a070f9ac557a.tar.gz barebox-7782c08047fc44874caf1c03c153a070f9ac557a.tar.xz | |
Merge branch 'for-next/usb-gadget'
Conflicts:
commands/Makefile
common/Kconfig
common/Makefile
drivers/usb/gadget/dfu.c
Diffstat (limited to 'commands/Makefile')
| -rw-r--r-- | commands/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/commands/Makefile b/commands/Makefile index ca0289782e..52b6137c01 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -102,3 +102,4 @@ obj-$(CONFIG_CMD_REGULATOR) += regulator.o obj-$(CONFIG_CMD_LSPCI) += lspci.o obj-$(CONFIG_CMD_IMD) += imd.o obj-$(CONFIG_CMD_HWCLOCK) += hwclock.o +obj-$(CONFIG_CMD_USBGADGET) += usbgadget.o |