[PATCH 1/2] Remove transitional, dead GENERIC_CLOCKEVENTS_MIGR

[Christoph Egger]

GENERIC_CLOCKEVENTS_MIGR was introduced to facilate transition to the
new codebase which was finished 2007 with
b8ce33590687888ebb900d09557b8807c4539022. However the config Item and
a tiny bit of code wasn't removed back then which is adressed by this
patch.

One might consider getting rid of GENERIC_CLOCKEVENTS_BUILD
alltogether however this patch is limited to changes to affecting the
actual build process in any way.

Signed-off-by: Christoph Egger <siccegge@xxxxxxxxx>
---
 include/linux/clockchips.h |    4 ----
 kernel/time/Kconfig        |    2 +-
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index fc53492..3ad8331 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -139,11 +139,7 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
 				      freq, minsec);
 }
 
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
 extern void clockevents_notify(unsigned long reason, void *arg);
-#else
-# define clockevents_notify(reason, arg) do { } while (0)
-#endif
 
 #else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
 
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index 95ed429..18ed376 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -25,5 +25,5 @@ config HIGH_RES_TIMERS
 config GENERIC_CLOCKEVENTS_BUILD
 	bool
 	default y
-	depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR
+	depends on GENERIC_CLOCKEVENTS
 
-- 
1.6.3.3









--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/