Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

[linux-2.6] / include / asm-m68k / floppy.h

diff --git a/include/asm-m68k/floppy.h b/include/asm-m68k/floppy.h
index c6e708dd9f624fd14dcb298c4055442008b98e2e..63a05ed95c17f1fd833385364c1fab00c1bf9bab 100644 (file)
--- a/include/asm-m68k/floppy.h
+++ b/include/asm-m68k/floppy.h
@@ -46,7 +46,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id,
 
 static int virtual_dma_count=0;
 static int virtual_dma_residue=0;
-static char *virtual_dma_addr=0;
+static char *virtual_dma_addr=NULL;
 static int virtual_dma_mode=0;
 static int doing_pdma=0;