diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-10 14:50:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-03-10 14:50:25 +0100 |
| commit | 3e48ef43eddaa09646925f6383d08d98be8b79ec (patch) | |
| tree | c00f28356619745ff80faf34b92b696aaa8e2c5b /include | |
| parent | f4491d7b0404191a143aae3ee93fe04d396b3dea (diff) | |
| parent | 4b8ac386b3c8395694b2b28f934cd55a96f9553d (diff) | |
| download | barebox-3e48ef43eddaa09646925f6383d08d98be8b79ec.tar.gz barebox-3e48ef43eddaa09646925f6383d08d98be8b79ec.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index fc141a474e..2d1dc411d7 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -1,5 +1,5 @@ -#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 || defined CONFIG_ARCH_IMX51 +#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 || defined CONFIG_ARCH_IMX51 || defined CONFIG_X86 #include <mach/barebox.lds.h> #endif |