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 git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip27
/
ip27-timer.c
diff --git
a/arch/mips/sgi-ip27/ip27-timer.c
b/arch/mips/sgi-ip27/ip27-timer.c
index
d6802d6
..
c01f558
100644
(file)
--- a/
arch/mips/sgi-ip27/ip27-timer.c
+++ b/
arch/mips/sgi-ip27/ip27-timer.c
@@
-36,21
+36,18
@@
#include <asm/sn/sn0/hubio.h>
#include <asm/pci/bridge.h>
#include <asm/sn/sn0/hubio.h>
#include <asm/pci/bridge.h>
-static void enable_rt_irq(
unsigned int irq
)
+static void enable_rt_irq(
struct irq_data *d
)
{
}
{
}
-static void disable_rt_irq(
unsigned int irq
)
+static void disable_rt_irq(
struct irq_data *d
)
{
}
static struct irq_chip rt_irq_type = {
.name = "SN HUB RT timer",
{
}
static struct irq_chip rt_irq_type = {
.name = "SN HUB RT timer",
- .ack = disable_rt_irq,
- .mask = disable_rt_irq,
- .mask_ack = disable_rt_irq,
- .unmask = enable_rt_irq,
- .eoi = enable_rt_irq,
+ .irq_mask = disable_rt_irq,
+ .irq_unmask = enable_rt_irq,
};
static int rt_next_event(unsigned long delta, struct clock_event_device *evt)
};
static int rt_next_event(unsigned long delta, struct clock_event_device *evt)