git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
asm-sparc64
/
floppy.h
diff --git
a/include/asm-sparc64/floppy.h
b/include/asm-sparc64/floppy.h
index
1bc43aa
..
e071b4b
100644
(file)
--- a/
include/asm-sparc64/floppy.h
+++ b/
include/asm-sparc64/floppy.h
@@
-164,7
+164,7
@@
unsigned long pdma_size;
volatile int doing_pdma = 0;
/* This is software state */
volatile int doing_pdma = 0;
/* This is software state */
-char *pdma_base =
0
;
+char *pdma_base =
NULL
;
unsigned long pdma_areasize;
/* Common routines to all controller types on the Sparc. */
unsigned long pdma_areasize;
/* Common routines to all controller types on the Sparc. */
@@
-173,7
+173,7
@@
static void sun_fd_disable_dma(void)
doing_pdma = 0;
if (pdma_base) {
mmu_unlockarea(pdma_base, pdma_areasize);
doing_pdma = 0;
if (pdma_base) {
mmu_unlockarea(pdma_base, pdma_areasize);
- pdma_base =
0
;
+ pdma_base =
NULL
;
}
}
}
}
@@
-613,7
+613,7
@@
static unsigned long __init sun_floppy_init(void)
} else {
#ifdef CONFIG_PCI
struct linux_ebus *ebus;
} else {
#ifdef CONFIG_PCI
struct linux_ebus *ebus;
- struct linux_ebus_device *edev =
0
;
+ struct linux_ebus_device *edev =
NULL
;
unsigned long config = 0;
unsigned long auxio_reg;
unsigned long config = 0;
unsigned long auxio_reg;