vserver 1.9.3

[linux-2.6.git] / drivers / fc4 / socal.c

diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index db01b6d..5ee4dda 100644 (file)
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -60,7 +60,7 @@ static char *version =
 #define for_each_socal(s) for (s = socals; s; s = s->next)
 struct socal *socals = NULL;
 
-static void socal_copy_from_xram(void *d, unsigned long xram, long size)
+static void socal_copy_from_xram(void *d, void __iomem *xram, long size)
 {
        u32 *dp = (u32 *) d;
        while (size) {
@@ -70,7 +70,7 @@ static void socal_copy_from_xram(void *d, unsigned long xram, long size)
        }
 }
 
-static void socal_copy_to_xram(unsigned long xram, void *s, long size)
+static void socal_copy_to_xram(void __iomem *xram, void *s, long size)
 {
        u32 *sp = (u32 *) s;
        while (size) {
@@ -851,7 +851,7 @@ static inline void socal_init(struct sbus_dev *sdev, int no)
 static int __init socal_probe(void)
 {
        struct sbus_bus *sbus;
-       struct sbus_dev *sdev = 0;
+       struct sbus_dev *sdev = NULL;
        struct socal *s;
        int cards = 0;