aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/apollo
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-10-04 05:41:24 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 05:09:21 -0500
commitabe48101c17eaf1b5d85270272392e6111562626 (patch)
tree4cf0f060b2e2efcfa41592be6aaf8a427dc09939 /arch/m68k/apollo
parentcf288bd5b122d12476fd7d9825c292daef5dba58 (diff)
m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/apollo')
-rw-r--r--arch/m68k/apollo/config.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c
index c90c19e904bc..9268c0f96376 100644
--- a/arch/m68k/apollo/config.c
+++ b/arch/m68k/apollo/config.c
@@ -11,6 +11,7 @@
11#include <asm/setup.h> 11#include <asm/setup.h>
12#include <asm/bootinfo.h> 12#include <asm/bootinfo.h>
13#include <asm/bootinfo-apollo.h> 13#include <asm/bootinfo-apollo.h>
14#include <asm/byteorder.h>
14#include <asm/pgtable.h> 15#include <asm/pgtable.h>
15#include <asm/apollohw.h> 16#include <asm/apollohw.h>
16#include <asm/irq.h> 17#include <asm/irq.h>
@@ -48,15 +49,15 @@ static const char *apollo_models[] = {
48int __init apollo_parse_bootinfo(const struct bi_record *record) 49int __init apollo_parse_bootinfo(const struct bi_record *record)
49{ 50{
50 int unknown = 0; 51 int unknown = 0;
51 const unsigned long *data = record->data; 52 const void *data = record->data;
52 53
53 switch(record->tag) { 54 switch (be16_to_cpu(record->tag)) {
54 case BI_APOLLO_MODEL: 55 case BI_APOLLO_MODEL:
55 apollo_model=*data; 56 apollo_model = be32_to_cpup(data);
56 break; 57 break;
57 58
58 default: 59 default:
59 unknown=1; 60 unknown=1;
60 } 61 }
61 62
62 return unknown; 63 return unknown;