diff options
| -rw-r--r-- | arch/x86/include/asm/olpc_ofw.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/olpc.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/olpc_ofw.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h index 3e63d857c48f..08fde475cb3b 100644 --- a/arch/x86/include/asm/olpc_ofw.h +++ b/arch/x86/include/asm/olpc_ofw.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #define olpc_ofw(name, args, res) \ | 12 | #define olpc_ofw(name, args, res) \ |
| 13 | __olpc_ofw((name), ARRAY_SIZE(args), args, ARRAY_SIZE(res), res) | 13 | __olpc_ofw((name), ARRAY_SIZE(args), args, ARRAY_SIZE(res), res) |
| 14 | 14 | ||
| 15 | extern int __olpc_ofw(const char *name, int nr_args, void **args, int nr_res, | 15 | extern int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res, |
| 16 | void **res); | 16 | void **res); |
| 17 | 17 | ||
| 18 | /* determine whether OFW is available and lives in the proper memory */ | 18 | /* determine whether OFW is available and lives in the proper memory */ |
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c index f5ff3903b38b..0e0cdde519be 100644 --- a/arch/x86/kernel/olpc.c +++ b/arch/x86/kernel/olpc.c | |||
| @@ -188,7 +188,7 @@ static void __init platform_detect(void) | |||
| 188 | { | 188 | { |
| 189 | size_t propsize; | 189 | size_t propsize; |
| 190 | __be32 rev; | 190 | __be32 rev; |
| 191 | void *args[] = { NULL, "board-revision-int", &rev, (void *)4 }; | 191 | const void *args[] = { NULL, "board-revision-int", &rev, (void *)4 }; |
| 192 | void *res[] = { &propsize }; | 192 | void *res[] = { &propsize }; |
| 193 | 193 | ||
| 194 | if (olpc_ofw("getprop", args, res) || propsize != 4) { | 194 | if (olpc_ofw("getprop", args, res) || propsize != 4) { |
diff --git a/arch/x86/kernel/olpc_ofw.c b/arch/x86/kernel/olpc_ofw.c index f5d499fbe74f..3218aa71ab5e 100644 --- a/arch/x86/kernel/olpc_ofw.c +++ b/arch/x86/kernel/olpc_ofw.c | |||
| @@ -40,7 +40,7 @@ void __init setup_olpc_ofw_pgd(void) | |||
| 40 | early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD); | 40 | early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | int __olpc_ofw(const char *name, int nr_args, void **args, int nr_res, | 43 | int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res, |
| 44 | void **res) | 44 | void **res) |
| 45 | { | 45 | { |
| 46 | int ofw_args[MAXARGS + 3]; | 46 | int ofw_args[MAXARGS + 3]; |
