aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv310
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-12-30 10:43:56 +0900
committerKukjin Kim <kgene.kim@samsung.com>2010-12-30 10:43:56 +0900
commit57ca51514905b7aea532977e4e87e989d33bfcbb (patch)
tree93ffb69fb39c248f05ab6fcaa8063f3aa82fd8da /arch/arm/mach-s5pv310
parentMerge branch 'next-samsung-asoc2' into for-next-new (diff)
parentARM: SAMSUNG: Add support for Power Domain control (diff)
downloadlinux-dev-57ca51514905b7aea532977e4e87e989d33bfcbb.tar.xz
linux-dev-57ca51514905b7aea532977e4e87e989d33bfcbb.zip
Merge branch 'next-samsung' into for-next-new
Diffstat (limited to 'arch/arm/mach-s5pv310')
-rw-r--r--arch/arm/mach-s5pv310/irq-eint.c2
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 = {
.ack = s5pv310_irq_eint_ack,
.set_type = s5pv310_irq_eint_set_type,
#ifdef CONFIG_PM
- .set_wake = s3c_irqext_wake,
+ .irq_set_wake = s3c_irqext_wake,
#endif
};