diff options
author | Paul Mackerras <paulus@samba.org> | 2005-11-02 03:58:12 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-11-02 03:58:12 -0500 |
commit | 398382999bcff46ec1c7e7ab7574b10b087481c7 (patch) | |
tree | dbf9737ca24560fac3fafb170ed65169d319afc0 /arch | |
parent | 300230dcba386153d077867d60cd24cd97d660f7 (diff) |
powerpc: Compile fixes for chrp/nvram.c
Include asm/rtas.h for prototype for rtas_call etc., and make the
`done' variable unsigned int since that's what rtas_call wants.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/chrp/nvram.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c index 65266b46db9b..150f67d6f90c 100644 --- a/arch/powerpc/platforms/chrp/nvram.c +++ b/arch/powerpc/platforms/chrp/nvram.c | |||
@@ -17,6 +17,7 @@ | |||
17 | #include <asm/uaccess.h> | 17 | #include <asm/uaccess.h> |
18 | #include <asm/prom.h> | 18 | #include <asm/prom.h> |
19 | #include <asm/machdep.h> | 19 | #include <asm/machdep.h> |
20 | #include <asm/rtas.h> | ||
20 | #include "chrp.h" | 21 | #include "chrp.h" |
21 | 22 | ||
22 | static unsigned int nvram_size; | 23 | static unsigned int nvram_size; |
@@ -25,7 +26,8 @@ static DEFINE_SPINLOCK(nvram_lock); | |||
25 | 26 | ||
26 | static unsigned char chrp_nvram_read(int addr) | 27 | static unsigned char chrp_nvram_read(int addr) |
27 | { | 28 | { |
28 | unsigned long done, flags; | 29 | unsigned int done; |
30 | unsigned long flags; | ||
29 | unsigned char ret; | 31 | unsigned char ret; |
30 | 32 | ||
31 | if (addr >= nvram_size) { | 33 | if (addr >= nvram_size) { |
@@ -46,7 +48,8 @@ static unsigned char chrp_nvram_read(int addr) | |||
46 | 48 | ||
47 | static void chrp_nvram_write(int addr, unsigned char val) | 49 | static void chrp_nvram_write(int addr, unsigned char val) |
48 | { | 50 | { |
49 | unsigned long done, flags; | 51 | unsigned int done; |
52 | unsigned long flags; | ||
50 | 53 | ||
51 | if (addr >= nvram_size) { | 54 | if (addr >= nvram_size) { |
52 | printk(KERN_DEBUG "%s: write addr %d > nvram_size %u\n", | 55 | printk(KERN_DEBUG "%s: write addr %d > nvram_size %u\n", |