diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-28 18:50:01 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-28 18:50:01 +0100 |
| commit | 009d75ccc11d27b9a083375a88bb93cb746b4800 (patch) | |
| tree | 12abe9fcf437d58b73ee1fa8d422548560deaae5 /include/configs/pcm051.h | |
| parent | 417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (diff) | |
| parent | d53e340edf65ff253d3a7b06ebe60501045892e3 (diff) | |
| download | u-boot-imx-009d75ccc11d27b9a083375a88bb93cb746b4800.zip u-boot-imx-009d75ccc11d27b9a083375a88bb93cb746b4800.tar.gz u-boot-imx-009d75ccc11d27b9a083375a88bb93cb746b4800.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
drivers/spi/tegra20_sflash.c
include/fdtdec.h
lib/fdtdec.c
Diffstat (limited to 'include/configs/pcm051.h')
| -rw-r--r-- | include/configs/pcm051.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 63ab123..d0ea74e 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -21,8 +21,7 @@ #define CONFIG_AM33XX -#include <asm/arch/cpu.h> -#include <asm/arch/hardware.h> +#include <asm/arch/omap.h> #define CONFIG_DMA_COHERENT #define CONFIG_DMA_COHERENT_SIZE (1 << 20) |