diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:00:25 +0200 |
| commit | 33c56e21eb3bf841c79d9c8a40dedc8b16b774f2 (patch) | |
| tree | fc0e871d5fc9020e0c4bb01ef0a5cf4ece6060a1 /commands/Makefile | |
| parent | d32008b2797a7c1bb13ec0cb3273de2dfcc97d02 (diff) | |
| parent | ce8f489122e8390360e87c84888aacfc87743a83 (diff) | |
| download | barebox-33c56e21eb3bf841c79d9c8a40dedc8b16b774f2.tar.gz barebox-33c56e21eb3bf841c79d9c8a40dedc8b16b774f2.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
commands/Makefile
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 f4e0ac63a6..58d27fa905 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -92,3 +92,4 @@ obj-$(CONFIG_CMD_BAREBOX_UPDATE)+= barebox-update.o obj-$(CONFIG_CMD_MIITOOL) += miitool.o obj-$(CONFIG_CMD_DETECT) += detect.o obj-$(CONFIG_CMD_BOOT) += boot.o +obj-$(CONFIG_CMD_DEVINFO) += devinfo.o |