aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/ar7/prom.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 14:56:19 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-08 14:56:19 +0900
commit18d4ed4342c14ebeebe60d267b171053efcdfa87 (patch)
treef315e77f66cbb70869e2f80cde5c18380a80901e /arch/mips/ar7/prom.c
parent722d0daf2b607a32dad1357bf797e3803484af0a (diff)
parent22de4534ae12d61257fc0e53d2571686b03305bc (diff)
downloadkernel_goldelico_gta04-18d4ed4342c14ebeebe60d267b171053efcdfa87.zip
kernel_goldelico_gta04-18d4ed4342c14ebeebe60d267b171053efcdfa87.tar.gz
kernel_goldelico_gta04-18d4ed4342c14ebeebe60d267b171053efcdfa87.tar.bz2
Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1 version. Conflicts: sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'arch/mips/ar7/prom.c')
-rw-r--r--arch/mips/ar7/prom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c
index 23818d2..8088c6f 100644
--- a/arch/mips/ar7/prom.c
+++ b/arch/mips/ar7/prom.c
@@ -77,7 +77,7 @@ struct psp_env_chunk {
u16 csum;
u8 len;
char data[11];
-} __attribute__ ((packed));
+} __packed;
struct psp_var_map_entry {
u8 num;