diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 11:52:04 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-05-26 11:52:04 -0400 |
| commit | 7a0287df3e83a0012dfc496d4a8af9c1c5b126ef (patch) | |
| tree | 27cc2f768de7e9014ffa899117bf219d0f20fb5e /arch/arm/mach-omap2/pm.c | |
| parent | 6738d3210aabe3016a1b03cd98a7fc479c229197 (diff) | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
Merge tag 'v2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 30af3351c2d6..49486f522dca 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
| @@ -89,6 +89,7 @@ static void omap2_init_processor_devices(void) | |||
| 89 | if (cpu_is_omap44xx()) { | 89 | if (cpu_is_omap44xx()) { |
| 90 | _init_omap_device("l3_main_1", &l3_dev); | 90 | _init_omap_device("l3_main_1", &l3_dev); |
| 91 | _init_omap_device("dsp", &dsp_dev); | 91 | _init_omap_device("dsp", &dsp_dev); |
| 92 | _init_omap_device("iva", &iva_dev); | ||
| 92 | } else { | 93 | } else { |
| 93 | _init_omap_device("l3_main", &l3_dev); | 94 | _init_omap_device("l3_main", &l3_dev); |
| 94 | } | 95 | } |