diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /arch/arm/common/sa1111.c | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
| download | kernel_goldelico_gta04-23946a8a980d13af7b84bcf3ce023e0d166ec83f.zip kernel_goldelico_gta04-23946a8a980d13af7b84bcf3ce023e0d166ec83f.tar.gz kernel_goldelico_gta04-23946a8a980d13af7b84bcf3ce023e0d166ec83f.tar.bz2 | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/arm/common/sa1111.c')
| -rw-r--r-- | arch/arm/common/sa1111.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 1cdb26a..a331c12 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -272,7 +272,8 @@ static int sa1111_wake_lowirq(unsigned int irq, unsigned int on) return 0; } -static struct irqchip sa1111_low_chip = { +static struct irq_chip sa1111_low_chip = { + .name = "SA1111-l", .ack = sa1111_ack_irq, .mask = sa1111_mask_lowirq, .unmask = sa1111_unmask_lowirq, @@ -368,7 +369,8 @@ static int sa1111_wake_highirq(unsigned int irq, unsigned int on) return 0; } -static struct irqchip sa1111_high_chip = { +static struct irq_chip sa1111_high_chip = { + .name = "SA1111-h", .ack = sa1111_ack_irq, .mask = sa1111_mask_highirq, .unmask = sa1111_unmask_highirq, |