diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 11:50:25 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 11:50:25 +0200 |
commit | 4eef93da262048eb1118e726b3ec5b8ebd3c6c91 (patch) | |
tree | 8a28287e405742086f6df380ee558265d17cf3f6 /arch/arm/include/asm/arch-at91/sama5d3_smc.h | |
parent | 31043e20ae748635f142483e8b7b645948687055 (diff) | |
parent | bc6958988726977b4089da1b13f6467e8e28efd2 (diff) | |
download | u-boot-imx-4eef93da262048eb1118e726b3ec5b8ebd3c6c91.zip u-boot-imx-4eef93da262048eb1118e726b3ec5b8ebd3c6c91.tar.gz u-boot-imx-4eef93da262048eb1118e726b3ec5b8ebd3c6c91.tar.bz2 |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-at91/sama5d3_smc.h')
-rw-r--r-- | arch/arm/include/asm/arch-at91/sama5d3_smc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-at91/sama5d3_smc.h b/arch/arm/include/asm/arch-at91/sama5d3_smc.h index c060894..6caa9b6 100644 --- a/arch/arm/include/asm/arch-at91/sama5d3_smc.h +++ b/arch/arm/include/asm/arch-at91/sama5d3_smc.h @@ -17,7 +17,6 @@ #define AT91_ASM_SMC_MODE0 (ATMEL_BASE_SMC + 0x60C) #else struct at91_cs { - u32 reserved[96]; u32 setup; /* 0x600 SMC Setup Register */ u32 pulse; /* 0x604 SMC Pulse Register */ u32 cycle; /* 0x608 SMC Cycle Register */ @@ -26,6 +25,7 @@ struct at91_cs { }; struct at91_smc { + u32 reserved[384]; struct at91_cs cs[4]; }; #endif /* __ASSEMBLY__ */ |