diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:43:56 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-12-30 10:43:56 +0900 |
| commit | 57ca51514905b7aea532977e4e87e989d33bfcbb (patch) | |
| tree | 93ffb69fb39c248f05ab6fcaa8063f3aa82fd8da /arch/arm/plat-s5p | |
| parent | e641d15869473d238d4beb0d79dd97a0f7d14e73 (diff) | |
| parent | d930596a3c093bf3f4fbf24f10ad0d8372d6ac21 (diff) | |
| download | linux-57ca51514905b7aea532977e4e87e989d33bfcbb.tar.gz linux-57ca51514905b7aea532977e4e87e989d33bfcbb.tar.bz2 linux-57ca51514905b7aea532977e4e87e989d33bfcbb.zip | |
Merge branch 'next-samsung' into for-next-new
Diffstat (limited to 'arch/arm/plat-s5p')
| -rw-r--r-- | arch/arm/plat-s5p/irq-eint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s5p/irq-eint.c b/arch/arm/plat-s5p/irq-eint.c index 752f1a645f9d..f2f2e1ccd0e6 100644 --- a/arch/arm/plat-s5p/irq-eint.c +++ b/arch/arm/plat-s5p/irq-eint.c @@ -125,7 +125,7 @@ static struct irq_chip s5p_irq_eint = { .ack = s5p_irq_eint_ack, .set_type = s5p_irq_eint_set_type, #ifdef CONFIG_PM - .set_wake = s3c_irqext_wake, + .irq_set_wake = s3c_irqext_wake, #endif }; @@ -194,7 +194,7 @@ static struct irq_chip s5p_irq_vic_eint = { .ack = s5p_irq_vic_eint_ack, .set_type = s5p_irq_eint_set_type, #ifdef CONFIG_PM - .set_wake = s3c_irqext_wake, + .irq_set_wake = s3c_irqext_wake, #endif }; |