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/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
irq.c
diff --git
a/arch/arm/mach-sa1100/irq.c
b/arch/arm/mach-sa1100/irq.c
index
b3a5602
..
f4c6322
100644
(file)
--- a/
arch/arm/mach-sa1100/irq.c
+++ b/
arch/arm/mach-sa1100/irq.c
@@
-11,12
+11,13
@@
*/
#include <linux/init.h>
#include <linux/module.h>
*/
#include <linux/init.h>
#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/ioport.h>
#include <linux/ptrace.h>
#include <linux/sysdev.h>
#include <asm/hardware.h>
#include <linux/ioport.h>
#include <linux/ptrace.h>
#include <linux/sysdev.h>
#include <asm/hardware.h>
-#include <asm/irq.h>
#include <asm/mach/irq.h>
#include "generic.h"
#include <asm/mach/irq.h>
#include "generic.h"
@@
-94,7
+95,8
@@
static int sa1100_low_gpio_wake(unsigned int irq, unsigned int on)
return 0;
}
return 0;
}
-static struct irqchip sa1100_low_gpio_chip = {
+static struct irq_chip sa1100_low_gpio_chip = {
+ .name = "GPIO-l",
.ack = sa1100_low_gpio_ack,
.mask = sa1100_low_gpio_mask,
.unmask = sa1100_low_gpio_unmask,
.ack = sa1100_low_gpio_ack,
.mask = sa1100_low_gpio_mask,
.unmask = sa1100_low_gpio_unmask,
@@
-108,8
+110,7
@@
static struct irqchip sa1100_low_gpio_chip = {
* and call the handler.
*/
static void
* and call the handler.
*/
static void
-sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc,
- struct pt_regs *regs)
+sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc)
{
unsigned int mask;
{
unsigned int mask;
@@
-126,7
+127,7
@@
sa1100_high_gpio_handler(unsigned int irq, struct irqdesc *desc,
mask >>= 11;
do {
if (mask & 1)
mask >>= 11;
do {
if (mask & 1)
- desc_handle_irq(irq, desc
, regs
);
+ desc_handle_irq(irq, desc);
mask >>= 1;
irq++;
desc++;
mask >>= 1;
irq++;
desc++;
@@
-177,7
+178,8
@@
static int sa1100_high_gpio_wake(unsigned int irq, unsigned int on)
return 0;
}
return 0;
}
-static struct irqchip sa1100_high_gpio_chip = {
+static struct irq_chip sa1100_high_gpio_chip = {
+ .name = "GPIO-h",
.ack = sa1100_high_gpio_ack,
.mask = sa1100_high_gpio_mask,
.unmask = sa1100_high_gpio_unmask,
.ack = sa1100_high_gpio_ack,
.mask = sa1100_high_gpio_mask,
.unmask = sa1100_high_gpio_unmask,
@@
-214,7
+216,8
@@
static int sa1100_set_wake(unsigned int irq, unsigned int on)
return -EINVAL;
}
return -EINVAL;
}
-static struct irqchip sa1100_normal_chip = {
+static struct irq_chip sa1100_normal_chip = {
+ .name = "SC",
.ack = sa1100_mask_irq,
.mask = sa1100_mask_irq,
.unmask = sa1100_unmask_irq,
.ack = sa1100_mask_irq,
.mask = sa1100_mask_irq,
.unmask = sa1100_unmask_irq,