remove queue-3.4/arm-omap-timer-obey-the-config_omap_32k_timer.patch

diff --git a/queue-3.4/arm-omap-timer-obey-the-config_omap_32k_timer.patch b/queue-3.4/arm-omap-timer-obey-the-config_omap_32k_timer.patch
deleted file mode 100644 (file)
index bba1180..0000000
--- a/queue-3.4/arm-omap-timer-obey-the-config_omap_32k_timer.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 45caae74d238ef6583e9402cb8c550cc0b0f7dbd Mon Sep 17 00:00:00 2001
-From: Igor Grinberg <grinberg@compulab.co.il>
-Date: Tue, 28 Aug 2012 01:26:14 +0300
-Subject: ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER
-
-From: Igor Grinberg <grinberg@compulab.co.il>
-
-commit 45caae74d238ef6583e9402cb8c550cc0b0f7dbd upstream.
-
-Currently, omap2_sync32k_clocksource_init() function initializes the 32K
-timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER
-setting.
-Fix this by providing a default implementation for
-!CONFIG_OMAP_32K_TIMER case.
-
-Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
-Reviewed-by: Paul Walmsley <paul@pwsan.com>
-Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/mach-omap2/timer.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/arch/arm/mach-omap2/timer.c
-+++ b/arch/arm/mach-omap2/timer.c
-@@ -275,6 +275,7 @@ static u32 notrace dmtimer_read_sched_cl
-       return 0;
- }
- 
-+#ifdef CONFIG_OMAP_32K_TIMER
- /* Setup free-running counter for clocksource */
- static void __init omap2_gp_clocksource_init(int gptimer_id,
-                                               const char *fck_source)
-@@ -304,6 +305,12 @@ static void __init omap##name##_timer_in
-       omap2_gp_clockevent_init((clkev_nr), clkev_src);                \
-       omap2_gp_clocksource_init((clksrc_nr), clksrc_src);             \
- }
-+#else
-+static inline int omap2_sync32k_clocksource_init(void)
-+{
-+      return -ENODEV;
-+}
-+#endif
- 
- #define OMAP_SYS_TIMER(name)                                          \
- struct sys_timer omap##name##_timer = {                                       \

diff --git a/queue-3.4/series b/queue-3.4/series
index b7b84a151d03c37bab12f8133c0db486c6fdcad7..16c42a6e9b0a2c302c6f3267c868396bbb898445 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -42,7 +42,6 @@ arm-7513-1-make-sure-dtc-is-built-before-running-it.patch
 arm-7526-1-traps-send-sigill-if-get_user-fails-on-undef-handling-path.patch
 arm-7527-1-uaccess-explicitly-check-__user-pointer-when-cpu_use_domains.patch
 staging-android-alarm-ioctl-command-encoding-fix.patch
-arm-omap-timer-obey-the-config_omap_32k_timer.patch
 arm-fix-ioremap-of-address-zero.patch
 alsa-hda-fix-missing-master-volume-for-stac9200-925x.patch
 alsa-hda-fix-oops-at-codec-reset-reconfig.patch