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
/
plat-mxc
/
avic.c
diff --git
a/arch/arm/plat-mxc/avic.c
b/arch/arm/plat-mxc/avic.c
index
9a4e8a2
..
deb284b
100644
(file)
--- a/
arch/arm/plat-mxc/avic.c
+++ b/
arch/arm/plat-mxc/avic.c
@@
-89,22
+89,22
@@
static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
#endif /* CONFIG_FIQ */
/* Disable interrupt number "irq" in the AVIC */
#endif /* CONFIG_FIQ */
/* Disable interrupt number "irq" in the AVIC */
-static void mxc_mask_irq(
unsigned int irq
)
+static void mxc_mask_irq(
struct irq_data *d
)
{
{
- __raw_writel(irq, avic_base + AVIC_INTDISNUM);
+ __raw_writel(
d->
irq, avic_base + AVIC_INTDISNUM);
}
/* Enable interrupt number "irq" in the AVIC */
}
/* Enable interrupt number "irq" in the AVIC */
-static void mxc_unmask_irq(
unsigned int irq
)
+static void mxc_unmask_irq(
struct irq_data *d
)
{
{
- __raw_writel(irq, avic_base + AVIC_INTENNUM);
+ __raw_writel(
d->
irq, avic_base + AVIC_INTENNUM);
}
static struct mxc_irq_chip mxc_avic_chip = {
.base = {
}
static struct mxc_irq_chip mxc_avic_chip = {
.base = {
- .ack = mxc_mask_irq,
- .mask = mxc_mask_irq,
- .unmask = mxc_unmask_irq,
+ .
irq_
ack = mxc_mask_irq,
+ .
irq_
mask = mxc_mask_irq,
+ .
irq_
unmask = mxc_unmask_irq,
},
#ifdef CONFIG_MXC_IRQ_PRIOR
.set_priority = avic_irq_set_priority,
},
#ifdef CONFIG_MXC_IRQ_PRIOR
.set_priority = avic_irq_set_priority,