diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:37 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-03-04 09:21:37 +0100 |
commit | c6813a5fb1c776f3e161d7ae881316d01e9cc39e (patch) | |
tree | 20c250370202dacae6572f900f4b9fe0ca2b5f4f /common/Makefile | |
parent | 1eb77960b8f45e48e3b1bd49bd45c4c18a9e3e01 (diff) | |
parent | 760689e5ccf10c51988da2dd9277d716b47dfb53 (diff) | |
download | barebox-c6813a5fb1c776f3e161d7ae881316d01e9cc39e.tar.gz barebox-c6813a5fb1c776f3e161d7ae881316d01e9cc39e.tar.xz |
Merge branch 'for-next/gpt'
Diffstat (limited to 'common/Makefile')
-rw-r--r-- | common/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 34eadaf5ac..1b3b009a3a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_ENV_HANDLING) += environment.o obj-$(CONFIG_AUTO_COMPLETE) += complete.o obj-$(CONFIG_POLLER) += poller.o obj-$(CONFIG_BLOCK) += block.o -obj-$(CONFIG_PARTITION_DISK) += partitions.o +obj-$(CONFIG_PARTITION_DISK) += partitions.o partitions/ obj-$(CONFIG_CMD_LOADS) += s_record.o obj-$(CONFIG_OFTREE) += oftree.o |