X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fearly-quirks.c;h=dec587b293bfcf9ccfed71798279fdd8408c9a9f;hb=fe69933652562f093ccde600cecf234930c01932;hp=8047ea8c2ab271e9e315547e3a77450d31edcab4;hpb=eb9c4f2ef7150ea2144b53811d1cf555d8e27f69;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index 8047ea8c2ab2..dec587b293bf 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -30,11 +30,8 @@ static void via_bugs(void)
 
 #ifdef CONFIG_ACPI
 
-static int nvidia_hpet_detected __initdata;
-
 static int __init nvidia_hpet_check(struct acpi_table_header *header)
 {
-	nvidia_hpet_detected = 1;
 	return 0;
 }
 #endif
@@ -52,11 +49,7 @@ static void nvidia_bugs(void)
 	if (acpi_use_timer_override)
 		return;
 
-	nvidia_hpet_detected = 0;
-	if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))
-		return;
-
-	if (nvidia_hpet_detected == 0) {
+	if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) {
 		acpi_skip_timer_override = 1;
 		printk(KERN_INFO "Nvidia board "
 		       "detected. Ignoring ACPI "