diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-20 21:59:55 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-20 21:59:55 -0500 |
| commit | 76e7461a21dfe13565b2a323b53c8cc963541126 (patch) | |
| tree | 8e399c71b38bb80c00d8a82310021b55ab6e8e33 /arch/mips/nxp/pnx833x/common/interrupts.c | |
| parent | d0b873fc73b793277c8a0824ce986b5bfeaef157 (diff) | |
| parent | dd59f6c76b265ed2ff18b497d6105a9511b1feb1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/nxp/pnx833x/common/interrupts.c')
| -rw-r--r-- | arch/mips/nxp/pnx833x/common/interrupts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/nxp/pnx833x/common/interrupts.c b/arch/mips/nxp/pnx833x/common/interrupts.c index 30533ba200e2..3a467c04f811 100644 --- a/arch/mips/nxp/pnx833x/common/interrupts.c +++ b/arch/mips/nxp/pnx833x/common/interrupts.c | |||
| @@ -295,7 +295,7 @@ static int pnx833x_set_type_gpio_irq(unsigned int irq, unsigned int flow_type) | |||
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | static struct irq_chip pnx833x_pic_irq_type = { | 297 | static struct irq_chip pnx833x_pic_irq_type = { |
| 298 | .typename = "PNX-PIC", | 298 | .name = "PNX-PIC", |
| 299 | .startup = pnx833x_startup_pic_irq, | 299 | .startup = pnx833x_startup_pic_irq, |
| 300 | .shutdown = pnx833x_shutdown_pic_irq, | 300 | .shutdown = pnx833x_shutdown_pic_irq, |
| 301 | .enable = pnx833x_enable_pic_irq, | 301 | .enable = pnx833x_enable_pic_irq, |
| @@ -305,7 +305,7 @@ static struct irq_chip pnx833x_pic_irq_type = { | |||
| 305 | }; | 305 | }; |
| 306 | 306 | ||
| 307 | static struct irq_chip pnx833x_gpio_irq_type = { | 307 | static struct irq_chip pnx833x_gpio_irq_type = { |
| 308 | .typename = "PNX-GPIO", | 308 | .name = "PNX-GPIO", |
| 309 | .startup = pnx833x_startup_gpio_irq, | 309 | .startup = pnx833x_startup_gpio_irq, |
| 310 | .shutdown = pnx833x_disable_gpio_irq, | 310 | .shutdown = pnx833x_disable_gpio_irq, |
| 311 | .enable = pnx833x_enable_gpio_irq, | 311 | .enable = pnx833x_enable_gpio_irq, |