diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:43:56 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-29 20:43:56 -0500 |
| commit | 57ca51514905b7aea532977e4e87e989d33bfcbb (patch) | |
| tree | 93ffb69fb39c248f05ab6fcaa8063f3aa82fd8da /arch/arm/mach-s5pv310 | |
| parent | e641d15869473d238d4beb0d79dd97a0f7d14e73 (diff) | |
| parent | d930596a3c093bf3f4fbf24f10ad0d8372d6ac21 (diff) | |
Merge branch 'next-samsung' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5pv310')
| -rw-r--r-- | arch/arm/mach-s5pv310/irq-eint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv310/irq-eint.c b/arch/arm/mach-s5pv310/irq-eint.c index 5877503e92c3..f5a415edc0b6 100644 --- a/arch/arm/mach-s5pv310/irq-eint.c +++ b/arch/arm/mach-s5pv310/irq-eint.c | |||
| @@ -152,7 +152,7 @@ static struct irq_chip s5pv310_irq_eint = { | |||
| 152 | .ack = s5pv310_irq_eint_ack, | 152 | .ack = s5pv310_irq_eint_ack, |
| 153 | .set_type = s5pv310_irq_eint_set_type, | 153 | .set_type = s5pv310_irq_eint_set_type, |
| 154 | #ifdef CONFIG_PM | 154 | #ifdef CONFIG_PM |
| 155 | .set_wake = s3c_irqext_wake, | 155 | .irq_set_wake = s3c_irqext_wake, |
| 156 | #endif | 156 | #endif |
| 157 | }; | 157 | }; |
| 158 | 158 | ||