diff options
author | 2010-12-22 11:32:24 -0800 | |
---|---|---|
committer | 2010-12-22 11:32:24 -0800 | |
commit | 808601b75804475c9022f6375e76b7c62c99a10a (patch) | |
tree | 355a3100269e88460e36f251ef0ce2f1ed88d52e /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
parent | Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus (diff) | |
parent | OMAP4: clock data: Add missing fixed divisors (diff) | |
download | linux-dev-808601b75804475c9022f6375e76b7c62c99a10a.tar.xz linux-dev-808601b75804475c9022f6375e76b7c62c99a10a.zip |
Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index d5acb63ba9e0..89a943e9459c 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -26,6 +26,7 @@ #include "prm-regbits-34xx.h" #include "cm-regbits-34xx.h" +#include "wd_timer.h" /* * OMAP3xxx hardware module integration data @@ -423,8 +424,9 @@ static struct omap_hwmod_class_sysconfig i2c_sysc = { }; static struct omap_hwmod_class omap3xxx_wd_timer_hwmod_class = { - .name = "wd_timer", - .sysc = &omap3xxx_wd_timer_sysc, + .name = "wd_timer", + .sysc = &omap3xxx_wd_timer_sysc, + .pre_shutdown = &omap2_wd_timer_disable }; /* wd_timer2 */ |