diff --git a/[refs] b/[refs] index b9826f57a833..1407308755fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ac2735462349ca35d8807d93d66cf4d9ea7b729 +refs/heads/master: db50342205deabaff9ce1fbe53d5ba351992fa08 diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig index f4f000abc4e9..b61a0632b351 100644 --- a/trunk/drivers/acpi/Kconfig +++ b/trunk/drivers/acpi/Kconfig @@ -3,6 +3,7 @@ # menu "ACPI (Advanced Configuration and Power Interface) Support" + depends on !X86_NUMAQ depends on !X86_VISWS depends on !IA64_HP_SIM depends on IA64 || X86