diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
| commit | 0a637bcc3c66c647f52970ddd1dbae2d749dc969 (patch) | |
| tree | 55ccc56a785cac9a3b990130f70316869ee77b47 /include/asm-generic | |
| parent | dd9f6d08a2736bf8ddc0004779c563a4c3a77cef (diff) | |
| parent | c6ef15b3879607a9e31964fc8942f95c253122f9 (diff) | |
| download | barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.gz barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.xz | |
Merge branch 'for-next/zynq'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index a77ef8f6f1..4754779005 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -12,7 +12,8 @@ defined CONFIG_ARCH_IMX53 || \ defined CONFIG_ARCH_IMX6 || \ defined CONFIG_X86 || \ - defined CONFIG_ARCH_EP93XX + defined CONFIG_ARCH_EP93XX || \ + defined CONFIG_ARCH_ZYNQ #include <mach/barebox.lds.h> #endif |