diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-09 14:04:35 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-09 15:00:55 -0700 |
| commit | aa8bd5969e90af0bd146b466f4f2c7c0c8992eab (patch) | |
| tree | 38c58b88667cbd3ceace54314046be1dac6a8a80 /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
| parent | 125c9671794a0d4b49d51a925aa8190f1d5d2168 (diff) | |
| parent | eb20f31f6e7d3ac19738e5a45df9b09b25381e73 (diff) | |
| download | talos-op-linux-aa8bd5969e90af0bd146b466f4f2c7c0c8992eab.tar.gz talos-op-linux-aa8bd5969e90af0bd146b466f4f2c7c0c8992eab.zip | |
Merge tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Paul Walmsley <paul@pwsan.com> via Tony Lindgren:
Some OMAP fixes for the 3.7 merge window, fixing mismerges, branch
integration issues, and bugs after the arm-soc merges.
* tag 'omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
ARM: OMAP3: fix workaround for EMU clockdomain
ARM: OMAP: omap3evm: fix new sparse warning
ARM: OMAP2+: hwmod data: Fix PMU interrupt definitions
ARM: am33xx: clk: Update clkdev table to add mcasp alias
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 82fdb5932d31..f67b7ee07dd4 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -94,7 +94,7 @@ static struct omap_hwmod omap3xxx_l4_sec_hwmod = { /* MPU */ static struct omap_hwmod_irq_info omap3xxx_mpu_irqs[] = { - { .name = "pmu", .irq = 3 }, + { .name = "pmu", .irq = 3 + OMAP_INTC_START }, { .irq = -1 } }; |
