diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:33:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:33:06 +0200 |
| commit | 845f765b6e7f5830b14c7910203d271c43e6af6a (patch) | |
| tree | e37b3c0d8d77c3218c280d8f38405d9a66e6bbd3 /commands/Makefile | |
| parent | 9bb76883c19f360693d54b12b67a9b0d17dc83a8 (diff) | |
| parent | acb427e2d0b9250859729420e93e4b77dfd43593 (diff) | |
| download | barebox-845f765b6e7f5830b14c7910203d271c43e6af6a.tar.gz barebox-845f765b6e7f5830b14c7910203d271c43e6af6a.tar.xz | |
Merge branch 'for-next/regulator'
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 1bb6a08e2e..f927d2173d 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -96,3 +96,4 @@ obj-$(CONFIG_CMD_DEVINFO) += devinfo.o obj-$(CONFIG_CMD_READF) += readf.o obj-$(CONFIG_CMD_MENUTREE) += menutree.o obj-$(CONFIG_CMD_2048) += 2048.o +obj-$(CONFIG_CMD_REGULATOR) += regulator.o |