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]
/
arch
/
alpha
/
kernel
/
sys_dp264.c
diff --git
a/arch/alpha/kernel/sys_dp264.c
b/arch/alpha/kernel/sys_dp264.c
index
d5da6b1
..
85d2f93
100644
(file)
--- a/
arch/alpha/kernel/sys_dp264.c
+++ b/
arch/alpha/kernel/sys_dp264.c
@@
-12,7
+12,6
@@
* Code supporting the DP264 (EV6+TSUNAMI).
*/
* Code supporting the DP264 (EV6+TSUNAMI).
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/mm.h>
@@
-218,7
+217,7
@@
static struct hw_interrupt_type clipper_irq_type = {
};
static void
};
static void
-dp264_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+dp264_device_interrupt(unsigned long vector)
{
#if 1
printk("dp264_device_interrupt: NOT IMPLEMENTED YET!! \n");
{
#if 1
printk("dp264_device_interrupt: NOT IMPLEMENTED YET!! \n");
@@
-237,9
+236,9
@@
dp264_device_interrupt(unsigned long vector, struct pt_regs * regs)
i = ffz(~pld);
pld &= pld - 1; /* clear least bit set */
if (i == 55)
i = ffz(~pld);
pld &= pld - 1; /* clear least bit set */
if (i == 55)
- isa_device_interrupt(vector
, regs
);
+ isa_device_interrupt(vector);
else
else
- handle_irq(16 + i
, 16 + i, regs
);
+ handle_irq(16 + i);
#if 0
TSUNAMI_cchip->dir0.csr = 1UL << i; mb();
tmp = TSUNAMI_cchip->dir0.csr;
#if 0
TSUNAMI_cchip->dir0.csr = 1UL << i; mb();
tmp = TSUNAMI_cchip->dir0.csr;
@@
-249,7
+248,7
@@
dp264_device_interrupt(unsigned long vector, struct pt_regs * regs)
}
static void
}
static void
-dp264_srm_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+dp264_srm_device_interrupt(unsigned long vector)
{
int irq;
{
int irq;
@@
-269,11
+268,11
@@
dp264_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
if (irq >= 32)
irq -= 16;
if (irq >= 32)
irq -= 16;
- handle_irq(irq
, regs
);
+ handle_irq(irq);
}
static void
}
static void
-clipper_srm_device_interrupt(unsigned long vector
, struct pt_regs * regs
)
+clipper_srm_device_interrupt(unsigned long vector)
{
int irq;
{
int irq;
@@
-291,7
+290,7
@@
clipper_srm_device_interrupt(unsigned long vector, struct pt_regs * regs)
*
* Eg IRQ 24 is DRIR bit 8, etc, etc
*/
*
* Eg IRQ 24 is DRIR bit 8, etc, etc
*/
- handle_irq(irq
, regs
);
+ handle_irq(irq);
}
static void __init
}
static void __init
@@
-300,7
+299,7
@@
init_tsunami_irqs(struct hw_interrupt_type * ops, int imin, int imax)
long i;
for (i = imin; i <= imax; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
long i;
for (i = imin; i <= imax; ++i) {
irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
- irq_desc[i].
handler
= ops;
+ irq_desc[i].
chip
= ops;
}
}
}
}