git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
arch
/
m68k
/
atari
/
stdma.c
diff --git
a/arch/m68k/atari/stdma.c
b/arch/m68k/atari/stdma.c
index
5283c73
..
ab3fd52
100644
(file)
--- a/
arch/m68k/atari/stdma.c
+++ b/
arch/m68k/atari/stdma.c
@@
-44,7
+44,7
@@
static int stdma_locked; /* the semaphore */
/* int func to be called */
static int stdma_locked; /* the semaphore */
/* int func to be called */
-static irq
return_t (*stdma_isr)(int, void *)
;
+static irq
_handler_t stdma_isr
;
static void *stdma_isr_data; /* data passed to isr */
static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */
static void *stdma_isr_data; /* data passed to isr */
static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */
@@
-75,7
+75,7
@@
static irqreturn_t stdma_int (int irq, void *dummy);
*
*/
*
*/
-void stdma_lock(irq
return_t (*handler)(int, void *)
, void *data)
+void stdma_lock(irq
_handler_t handler
, void *data)
{
unsigned long flags;
{
unsigned long flags;
@@
-174,7
+174,7
@@
int stdma_islocked(void)
void __init stdma_init(void)
{
stdma_isr = NULL;
void __init stdma_init(void)
{
stdma_isr = NULL;
- request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW,
+ request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW
| IRQF_SHARED
,
"ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int);
}
"ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int);
}