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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
include
/
asm-sparc
/
floppy.h
diff --git
a/include/asm-sparc/floppy.h
b/include/asm-sparc/floppy.h
index
780ee7f
..
7a941b8
100644
(file)
--- a/
include/asm-sparc/floppy.h
+++ b/
include/asm-sparc/floppy.h
@@
-17,10
+17,8
@@
/* We don't need no stinkin' I/O port allocation crap. */
#undef release_region
/* We don't need no stinkin' I/O port allocation crap. */
#undef release_region
-#undef check_region
#undef request_region
#define release_region(X, Y) do { } while(0)
#undef request_region
#define release_region(X, Y) do { } while(0)
-#define check_region(X, Y) (0)
#define request_region(X, Y, Z) (1)
/* References:
#define request_region(X, Y, Z) (1)
/* References:
@@
-227,7
+225,7
@@
static __inline__ 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
;
}
}
}
}