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 core 6 1.2949 + vserver 2.2.0
[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
..
9073c84
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
;
}
}
}
}
@@
-264,7
+262,7
@@
static __inline__ void sun_fd_enable_dma(void)
}
/* Our low-level entry point in arch/sparc/kernel/entry.S */
}
/* Our low-level entry point in arch/sparc/kernel/entry.S */
-irqreturn_t floppy_hardint(int irq, void *unused
, struct pt_regs *regs
);
+irqreturn_t floppy_hardint(int irq, void *unused);
static int sun_fd_request_irq(void)
{
static int sun_fd_request_irq(void)
{
@@
-273,7
+271,8
@@
static int sun_fd_request_irq(void)
if(!once) {
once = 1;
if(!once) {
once = 1;
- error = request_fast_irq(FLOPPY_IRQ, floppy_hardint, SA_INTERRUPT, "floppy");
+ error = request_fast_irq(FLOPPY_IRQ, floppy_hardint,
+ IRQF_DISABLED, "floppy");
return ((error == 0) ? 0 : -1);
} else return 0;
}
return ((error == 0) ? 0 : -1);
} else return 0;
}