diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:04 +0100 |
| commit | 0b12784089b6a4372ed27cf1fd578d85a7d3dbd4 (patch) | |
| tree | 6f25a55d72f51aeb1d42f02bf5f56edcc051b41a /commands/Makefile | |
| parent | 5c6cc8736ed4e14119fb2e8c0ed1ecab7caff9ae (diff) | |
| parent | 9a554f8ff25685e44431079e73887b061d6f4a41 (diff) | |
| download | barebox-0b12784089b6a4372ed27cf1fd578d85a7d3dbd4.tar.gz barebox-0b12784089b6a4372ed27cf1fd578d85a7d3dbd4.tar.xz | |
Merge branch 'for-next/oftree'
Conflicts:
drivers/of/base.c
Diffstat (limited to 'commands/Makefile')
| -rw-r--r-- | commands/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/commands/Makefile b/commands/Makefile index c4baf6a470..0ae6b9546a 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -67,6 +67,8 @@ obj-$(CONFIG_CMD_LED_TRIGGER) += trigger.o obj-$(CONFIG_CMD_USB) += usb.o obj-$(CONFIG_CMD_TIME) += time.o obj-$(CONFIG_CMD_OFTREE) += oftree.o +obj-$(CONFIG_CMD_OF_PROPERTY) += of_property.o +obj-$(CONFIG_CMD_OF_NODE) += of_node.o obj-$(CONFIG_CMD_MAGICVAR) += magicvar.o obj-$(CONFIG_CMD_IOMEM) += iomem.o obj-$(CONFIG_CMD_LINUX_EXEC) += linux_exec.o |