[-mm PATCH 11/11]Time: i386 clocksource drivers - backout pmtmr changes

[john stultz <johnstul@us.ibm.com>]

Sync up with changes to avoid pmtmr x86-64 collision. 

In order to avoid bisection troubles, this patch must be folded into 
its parent (time-i386-clocksource-drivers.patch) as the parent will 
fail to build.

Signed-off-by: John Stultz <johnstul@us.ibm.com>

 drivers/clocksource/Makefile  |    2 +-
 drivers/clocksource/acpi_pm.c |   13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

Index: mm-merge/drivers/clocksource/acpi_pm.c
===================================================================
--- mm-merge.orig/drivers/clocksource/acpi_pm.c
+++ mm-merge/drivers/clocksource/acpi_pm.c
@@ -24,25 +24,20 @@
 /* Number of PMTMR ticks expected during calibration run */
 #define PMTMR_TICKS_PER_SEC 3579545
 
-#if (defined(CONFIG_X86) && (!defined(CONFIG_X86_64)))
-# include "mach_timer.h"
-# define PMTMR_EXPECTED_RATE ((PMTMR_TICKS_PER_SEC*CALIBRATE_TIME_MSEC)/1000)
-#endif
-
 /*
  * The I/O port the PMTMR resides at.
  * The location is detected during setup_arch(),
  * in arch/i386/acpi/boot.c
  */
-extern u32 acpi_pmtmr_ioport;
-extern int acpi_pmtmr_buggy;
+u32 pmtmr_ioport;
+int acpi_pmtmr_buggy;
 
 #define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */
 
 static inline u32 read_pmtmr(void)
 {
 	/* mask the output to 24 bits */
-	return inl(acpi_pmtmr_ioport) & ACPI_PM_MASK;
+	return inl(pmtmr_ioport) & ACPI_PM_MASK;
 }
 
 static cycle_t acpi_pm_read_verified(void)
@@ -85,7 +80,7 @@ static int __init init_acpi_pm_clocksour
 	u32 value1, value2;
 	unsigned int i;
 
-	if (!acpi_pmtmr_ioport)
+	if (!pmtmr_ioport)
 		return -ENODEV;
 
 	clocksource_acpi_pm.mult = clocksource_hz2mult(PMTMR_TICKS_PER_SEC,
Index: mm-merge/drivers/clocksource/Makefile
===================================================================
--- mm-merge.orig/drivers/clocksource/Makefile
+++ mm-merge/drivers/clocksource/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_X86_CYCLONE_TIMER) += cyclone.o
-obj-$(CONFIG_ACPI) += acpi_pm.o
+obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o