diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:50:06 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:50:06 +0200 |
| commit | fbf082b56540b4f3853015f3686c8f106a91707a (patch) | |
| tree | e5901744625d45ca075a55eff3c9fc1e2c05a134 /drivers/of/Makefile | |
| parent | 8c5a1c0c81aade3546a18b12e2eeff0b38e79e99 (diff) | |
| parent | 6a37488917b22fcf24d99c695ed1755198a9393b (diff) | |
| download | barebox-fbf082b56540b4f3853015f3686c8f106a91707a.tar.gz barebox-fbf082b56540b4f3853015f3686c8f106a91707a.tar.xz | |
Merge branch 'for-next/of'
Conflicts:
arch/arm/boards/freescale-mx53-loco/board.c
drivers/of/Makefile
Diffstat (limited to 'drivers/of/Makefile')
| -rw-r--r-- | drivers/of/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/Makefile b/drivers/of/Makefile index 058afc2788..a19a8af635 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_GPIOLIB) += of_gpio.o obj-y += partition.o obj-y += of_net.o obj-$(CONFIG_MTD) += of_mtd.o +obj-$(CONFIG_OF_BAREBOX_DRIVERS) += barebox.o of_path.o |