diff options
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 9221a486b51f..381f4eb92352 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -33,7 +33,6 @@ | |||
33 | 33 | ||
34 | #include "mux.h" | 34 | #include "mux.h" |
35 | #include "control.h" | 35 | #include "control.h" |
36 | #include "wd_timer.h" | ||
37 | 36 | ||
38 | #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) | 37 | #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE) |
39 | 38 | ||
@@ -956,26 +955,12 @@ static inline void omap_init_vout(void) {} | |||
956 | 955 | ||
957 | /*-------------------------------------------------------------------------*/ | 956 | /*-------------------------------------------------------------------------*/ |
958 | 957 | ||
959 | static int omap2_disable_wdt(struct omap_hwmod *oh, void *unused) | ||
960 | { | ||
961 | return omap2_wd_timer_disable(oh); | ||
962 | } | ||
963 | |||
964 | static void __init omap_disable_wdt(void) | ||
965 | { | ||
966 | if (cpu_class_is_omap2()) | ||
967 | omap_hwmod_for_each_by_class("wd_timer", | ||
968 | omap2_disable_wdt, NULL); | ||
969 | return; | ||
970 | } | ||
971 | |||
972 | static int __init omap2_init_devices(void) | 958 | static int __init omap2_init_devices(void) |
973 | { | 959 | { |
974 | /* | 960 | /* |
975 | * please keep these calls, and their implementations above, | 961 | * please keep these calls, and their implementations above, |
976 | * in alphabetical order so they're easier to sort through. | 962 | * in alphabetical order so they're easier to sort through. |
977 | */ | 963 | */ |
978 | omap_disable_wdt(); | ||
979 | omap_hsmmc_reset(); | 964 | omap_hsmmc_reset(); |
980 | omap_init_audio(); | 965 | omap_init_audio(); |
981 | omap_init_camera(); | 966 | omap_init_camera(); |