diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:49:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-17 08:49:18 +0200 |
| commit | 09efce4ad3c08b89291cedffa054e03ef44f521a (patch) | |
| tree | 07e7d004f1962020401e62750597dfb4028f3af5 /arch/arm/mach-imx/Makefile | |
| parent | e6f224a55358f3a979434457c78df8fd0303bdff (diff) | |
| parent | f36c7921091090996a9045142624c3b0c4a0160c (diff) | |
| download | barebox-09efce4ad3c08b89291cedffa054e03ef44f521a.tar.gz barebox-09efce4ad3c08b89291cedffa054e03ef44f521a.tar.xz | |
Merge branch 'for-next/imx-work' into for-next/imx
Conflicts:
arch/arm/mach-imx/imx1.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/Makefile')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 517a5a766f..67f3a8cc03 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -13,5 +13,5 @@ obj-$(CONFIG_NAND_IMX) += nand.o obj-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o pbl-$(CONFIG_ARCH_IMX_EXTERNAL_BOOT_NAND) += external-nand-boot.o obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-pfd.o -obj-y += devices.o +obj-y += devices.o imx.o obj-y += boot.o |