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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
scsi
/
mac_esp.c
diff --git
a/drivers/scsi/mac_esp.c
b/drivers/scsi/mac_esp.c
index
e31fadd
..
118206d
100644
(file)
--- a/
drivers/scsi/mac_esp.c
+++ b/
drivers/scsi/mac_esp.c
@@
-43,9
+43,6
@@
/* #define DEBUG_MAC_ESP */
/* #define DEBUG_MAC_ESP */
-#define mac_turnon_irq(x) mac_enable_irq(x)
-#define mac_turnoff_irq(x) mac_disable_irq(x)
-
extern void esp_handle(struct NCR_ESP *esp);
extern void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
extern void esp_handle(struct NCR_ESP *esp);
extern void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs);
@@
-639,13
+636,13
@@
static void dma_init_write(struct NCR_ESP * esp, char * vaddress, int length)
static void dma_ints_off(struct NCR_ESP * esp)
{
static void dma_ints_off(struct NCR_ESP * esp)
{
-
mac_turnoff
_irq(esp->irq);
+
disable
_irq(esp->irq);
}
static void dma_ints_on(struct NCR_ESP * esp)
{
}
static void dma_ints_on(struct NCR_ESP * esp)
{
-
mac_turnon
_irq(esp->irq);
+
enable
_irq(esp->irq);
}
/*
}
/*