Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / include / asm-x86_64 / acpi.h

diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h
index e2b9923..2c95a31 100644 (file)
--- a/include/asm-x86_64/acpi.h
+++ b/include/asm-x86_64/acpi.h
@@ -162,21 +162,9 @@ extern int acpi_pci_disabled;
 
 extern u8 x86_acpiid_to_apicid[];
 
-extern int acpi_skip_timer_override;
-
-extern int unsync_tsc_on_multicluster;
+#define ARCH_HAS_POWER_INIT 1
 
-static inline int acpi_madt_oem_check(char *oem, char *productid) 
-{ 
-       /* Copied from i386. Probably has too many entries. */
-       if (!strncmp(oem, "IBM ENSW", 8) && 
-               (!strncmp(productid, "VIGIL SMP", 9) 
-                       || !strncmp(productid, "EXA", 3)
-                       || !strncmp(productid, "RUTHLESS SMP", 12))) {
-               unsync_tsc_on_multicluster = 1;
-        }
-        return 0;
-}
+extern int acpi_skip_timer_override;
 
 #endif /*__KERNEL__*/