diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-15 17:33:20 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-15 17:33:20 -0500 |
| commit | 86e732880f30977872ce23b9339fee8630f5f7cc (patch) | |
| tree | 192f081c57a6861e0c4b031091c8727c58c486ef /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
| parent | 6a1de81ebcf75e9eb77bc42e1593797c722a38a1 (diff) | |
| parent | c05c4a28af828fc46fbcbde72920ec405433b56d (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24.7ti-2.6.34-omap4-L24.7-p1
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 5d8406c6a126..2d99afecee64 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -4118,7 +4118,7 @@ static struct omap_hwmod_ocp_if *omap44xx_timer10_slaves[] = { }; static struct omap_hwmod omap44xx_timer10_hwmod = { - .name = "gpt10", + .name = "timer10", .class = &omap44xx_timer_1ms_hwmod_class, .mpu_irqs = omap44xx_timer10_irqs, .mpu_irqs_cnt = ARRAY_SIZE(omap44xx_timer10_irqs), |