diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
commit | 7a4b35082c0f6997cb32b67a9cde169ec8e64706 (patch) | |
tree | c3fb875143d9c7862c2051bcd3447e26e354fdde /arch/arm/plat-samsung | |
parent | defa4c738aa90e29e91eff43b0c1b3198367ce9c (diff) | |
parent | ea61623fe9badd5a195b3a0878e6d89a2f97ac0e (diff) | |
download | linux-7a4b35082c0f6997cb32b67a9cde169ec8e64706.tar.gz linux-7a4b35082c0f6997cb32b67a9cde169ec8e64706.tar.bz2 linux-7a4b35082c0f6997cb32b67a9cde169ec8e64706.zip |
Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm-cpufreq
ARM cpufreq updates from Viresh Kumar.
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 30c2fe243f76..0f9c3f431a5f 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -311,9 +311,9 @@ struct platform_device s5p_device_jpeg = { #ifdef CONFIG_S5P_DEV_FIMD0 static struct resource s5p_fimd0_resource[] = { [0] = DEFINE_RES_MEM(S5P_PA_FIMD0, SZ_32K), - [1] = DEFINE_RES_IRQ(IRQ_FIMD0_VSYNC), - [2] = DEFINE_RES_IRQ(IRQ_FIMD0_FIFO), - [3] = DEFINE_RES_IRQ(IRQ_FIMD0_SYSTEM), + [1] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_VSYNC, "vsync"), + [2] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_FIFO, "fifo"), + [3] = DEFINE_RES_IRQ_NAMED(IRQ_FIMD0_SYSTEM, "lcd_sys"), }; struct platform_device s5p_device_fimd0 = { |