projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
omap_hwmod_2xxx_ipblock_data.c
diff --git
a/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
b/arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
index 35dcdb66a4e01c6ef63b77c81506953d6fc45b50..bd9220ed5ab9d9fda89cca30b4bf1c339cad9f6d 100644
(file)
--- a/
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
+++ b/
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
@@
-219,7
+219,7
@@
struct omap_hwmod omap2xxx_l4_wkup_hwmod = {
/* MPU */
static struct omap_hwmod_irq_info omap2xxx_mpu_irqs[] = {
- { .name = "pmu", .irq = 3 },
+ { .name = "pmu", .irq = 3
+ OMAP_INTC_START
},
{ .irq = -1 }
};