VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / sbus / char / flash.c

diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 61cf81f..f35cb32 100644 (file)
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -105,7 +105,7 @@ flash_llseek(struct file *file, long long offset, int origin)
 }
 
 static ssize_t
-flash_read(struct file * file, char * buf,
+flash_read(struct file * file, char __user * buf,
           size_t count, loff_t *ppos)
 {
        unsigned long p = file->f_pos;
@@ -161,10 +161,10 @@ static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
 static int __init flash_init(void)
 {
        struct sbus_bus *sbus;
-       struct sbus_dev *sdev = 0;
+       struct sbus_dev *sdev = NULL;
 #ifdef CONFIG_PCI
        struct linux_ebus *ebus;
-       struct linux_ebus_device *edev = 0;
+       struct linux_ebus_device *edev = NULL;
        struct linux_prom_registers regs[2];
        int len, nregs;
 #endif