summaryrefslogtreecommitdiff
path: root/arch/m68k/apollo
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-10-04 11:41:24 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 11:09:21 +0100
commitabe48101c17eaf1b5d85270272392e6111562626 (patch)
tree4cf0f060b2e2efcfa41592be6aaf8a427dc09939 /arch/m68k/apollo
parentcf288bd5b122d12476fd7d9825c292daef5dba58 (diff)
downloadlwn-abe48101c17eaf1b5d85270272392e6111562626.tar.gz
lwn-abe48101c17eaf1b5d85270272392e6111562626.zip
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 @@
#include <asm/setup.h>
#include <asm/bootinfo.h>
#include <asm/bootinfo-apollo.h>
+#include <asm/byteorder.h>
#include <asm/pgtable.h>
#include <asm/apollohw.h>
#include <asm/irq.h>
@@ -48,15 +49,15 @@ static const char *apollo_models[] = {
int __init apollo_parse_bootinfo(const struct bi_record *record)
{
int unknown = 0;
- const unsigned long *data = record->data;
+ const void *data = record->data;
- switch(record->tag) {
- case BI_APOLLO_MODEL:
- apollo_model=*data;
- break;
+ switch (be16_to_cpu(record->tag)) {
+ case BI_APOLLO_MODEL:
+ apollo_model = be32_to_cpup(data);
+ break;
- default:
- unknown=1;
+ default:
+ unknown=1;
}
return unknown;