diff options
| author | David S. Miller | 2015-06-09 05:06:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-06-09 05:06:56 +0200 |
| commit | 941742f49762ba4c908510f036b09a46c1b14513 (patch) | |
| tree | aafb7a72c2072f98889406668003234bed56df02 /arch/arm/mach-exynos/suspend.c | |
| parent | net: phy: dp83867: Fix device tree entries (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.tar.gz kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.tar.xz kernel-qcow2-linux-941742f49762ba4c908510f036b09a46c1b14513.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/arm/mach-exynos/suspend.c')
| -rw-r--r-- | arch/arm/mach-exynos/suspend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c index c0b6dccbf7bd..7d23ce04cad5 100644 --- a/arch/arm/mach-exynos/suspend.c +++ b/arch/arm/mach-exynos/suspend.c @@ -87,8 +87,8 @@ static unsigned int exynos_pmu_spare3; static u32 exynos_irqwake_intmask = 0xffffffff; static const struct exynos_wkup_irq exynos3250_wkup_irq[] = { - { 105, BIT(1) }, /* RTC alarm */ - { 106, BIT(2) }, /* RTC tick */ + { 73, BIT(1) }, /* RTC alarm */ + { 74, BIT(2) }, /* RTC tick */ { /* sentinel */ }, }; |