]> err.no Git - linux-2.6/commitdiff
powerpc: Compile fixes for chrp/nvram.c
authorPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 08:58:12 +0000 (19:58 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 08:58:12 +0000 (19:58 +1100)
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>
arch/powerpc/platforms/chrp/nvram.c

index 65266b46db9b6a0e8da7b822d3739b5e0f10bac2..150f67d6f90cd6fb1fa536d188cb0063f2eba8b6 100644 (file)
@@ -17,6 +17,7 @@
 #include <asm/uaccess.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
+#include <asm/rtas.h>
 #include "chrp.h"
 
 static unsigned int nvram_size;
@@ -25,7 +26,8 @@ static DEFINE_SPINLOCK(nvram_lock);
 
 static unsigned char chrp_nvram_read(int addr)
 {
-       unsigned long done, flags;
+       unsigned int done;
+       unsigned long flags;
        unsigned char ret;
 
        if (addr >= nvram_size) {
@@ -46,7 +48,8 @@ static unsigned char chrp_nvram_read(int addr)
 
 static void chrp_nvram_write(int addr, unsigned char val)
 {
-       unsigned long done, flags;
+       unsigned int done;
+       unsigned long flags;
 
        if (addr >= nvram_size) {
                printk(KERN_DEBUG "%s: write addr %d > nvram_size %u\n",