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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ebsa110
/
core.c
diff --git
a/arch/arm/mach-ebsa110/core.c
b/arch/arm/mach-ebsa110/core.c
index
5df4099
..
7df083f
100644
(file)
--- a/
arch/arm/mach-ebsa110/core.c
+++ b/
arch/arm/mach-ebsa110/core.c
@@
-35,20
+35,20
@@
#define IRQ_STAT 0xff000000 /* read */
#define IRQ_MCLR 0xff000000 /* write */
#define IRQ_STAT 0xff000000 /* read */
#define IRQ_MCLR 0xff000000 /* write */
-static void ebsa110_mask_irq(
unsigned int irq
)
+static void ebsa110_mask_irq(
struct irq_data *d
)
{
{
- __raw_writeb(1 << irq, IRQ_MCLR);
+ __raw_writeb(1 <<
d->
irq, IRQ_MCLR);
}
}
-static void ebsa110_unmask_irq(
unsigned int irq
)
+static void ebsa110_unmask_irq(
struct irq_data *d
)
{
{
- __raw_writeb(1 << irq, IRQ_MSET);
+ __raw_writeb(1 <<
d->
irq, IRQ_MSET);
}
static struct irq_chip ebsa110_irq_chip = {
}
static struct irq_chip ebsa110_irq_chip = {
- .
ack
= ebsa110_mask_irq,
- .
mask
= ebsa110_mask_irq,
- .
unmask
= ebsa110_unmask_irq,
+ .
irq_ack
= ebsa110_mask_irq,
+ .
irq_mask
= ebsa110_mask_irq,
+ .
irq_unmask
= ebsa110_unmask_irq,
};
static void __init ebsa110_init_irq(void)
};
static void __init ebsa110_init_irq(void)