diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-05-18 14:31:56 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-05-18 14:31:56 +0200 |
| commit | 0ea91423f47461bf7eaed2d4aff198076dd07fd5 (patch) | |
| tree | b5201f976fe3f7f5ed6f485f7ef81d8d8c9ec033 /arch/arm/include/asm/arch-at91/at91_st.h | |
| parent | ce6400a0f88f9648d6def519244ea8c33c7612b2 (diff) | |
| parent | 24890f11980eb70d835ca7e0b00d32284d8f546c (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
* 'master' of git://git.denx.de/u-boot-arm: (40 commits)
avr32: add ATAG_BOARDINFO
at91: reworked support for otc570 board
at91: reworked support for meesc board
hammerhead: move CONFIG_SYS_TEXT_BASE to header
mimc200: move CONFIG_SYS_TEXT_BASE to header
favr-32-ezkit: move CONFIG_SYS_TEXT_BASE to header
atstk100x: move CONFIG_SYS_TEXT_BASE to header
atngw100: move CONFIG_SYS_TEXT_BASE to header
mimc200: fix "#define XXXX 1"
hammerhead: fix "#define XXXX 1"
favr-32-ezkit: fix "#define XXXX 1"
atstk1006: fix "#define XXXX 1"
atstk1004: fix "#define XXXX 1"
atstk1003: fix "#define XXXX 1"
atstk1002: fix "#define XXXX 1"
atngw100: fix "#define XXXX 1"
avr32: use single linker script
avr32/config.mk: simplify PLATFORM_RELFLAGS
avr32: fix linking
Add support for Bluewater Systems Snapper 9260 and 9G20 modules
...
Diffstat (limited to 'arch/arm/include/asm/arch-at91/at91_st.h')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91_st.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_st.h b/arch/arm/include/asm/arch-at91/at91_st.h index 53f932085b..98b0a7640b 100644 --- a/arch/arm/include/asm/arch-at91/at91_st.h +++ b/arch/arm/include/asm/arch-at91/at91_st.h @@ -35,7 +35,7 @@ typedef struct at91_st { u32 imr; u32 rtar; u32 crtr; -} __attribute__ ((packed)) at91_st_t ; +} at91_st_t ; #define AT91_ST_CR_WDRST 1 |