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/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop32x
/
irq.c
diff --git
a/arch/arm/mach-iop32x/irq.c
b/arch/arm/mach-iop32x/irq.c
index
ba59b2d
..
d3426a1
100644
(file)
--- a/
arch/arm/mach-iop32x/irq.c
+++ b/
arch/arm/mach-iop32x/irq.c
@@
-32,24
+32,24
@@
static void intstr_write(u32 val)
}
static void
}
static void
-iop32x_irq_mask(
unsigned int irq
)
+iop32x_irq_mask(
struct irq_data *d
)
{
{
- iop32x_mask &= ~(1 << irq);
+ iop32x_mask &= ~(1 <<
d->
irq);
intctl_write(iop32x_mask);
}
static void
intctl_write(iop32x_mask);
}
static void
-iop32x_irq_unmask(
unsigned int irq
)
+iop32x_irq_unmask(
struct irq_data *d
)
{
{
- iop32x_mask |= 1 << irq;
+ iop32x_mask |= 1 <<
d->
irq;
intctl_write(iop32x_mask);
}
struct irq_chip ext_chip = {
intctl_write(iop32x_mask);
}
struct irq_chip ext_chip = {
- .name = "IOP32x",
- .
ack
= iop32x_irq_mask,
- .
mask
= iop32x_irq_mask,
- .
unmask
= iop32x_irq_unmask,
+ .name
= "IOP32x",
+ .
irq_ack
= iop32x_irq_mask,
+ .
irq_mask
= iop32x_irq_mask,
+ .
irq_unmask
= iop32x_irq_unmask,
};
void __init iop32x_init_irq(void)
};
void __init iop32x_init_irq(void)