Merge master.kernel.org:/home/rmk/linux-2.6-mmc

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

diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h
index 780ee7ff9dc3d866a9e1665544b317b45365e086..7a941b800b6b42efc00bb80ca3510ad740f4a036 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
-#undef check_region
 #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:
@@ -227,7 +225,7 @@ static __inline__ void sun_fd_disable_dma(void)
        doing_pdma = 0;
        if (pdma_base) {
                mmu_unlockarea(pdma_base, pdma_areasize);
-               pdma_base = 0;
+               pdma_base = NULL;
        }
 }