diff --git a/[refs] b/[refs]
index b03d7aaefeab..ae976d9e5387 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dac562f6d89b3f70c3f12b0e17878b07af42298
+refs/heads/master: 5d8e7aa6e5c21e14843404c5e4c04d4cf043e40e
diff --git a/trunk/drivers/acpi/Makefile b/trunk/drivers/acpi/Makefile
index a18243488c66..5984b4f6715a 100644
--- a/trunk/drivers/acpi/Makefile
+++ b/trunk/drivers/acpi/Makefile
@@ -16,7 +16,7 @@ EXTRA_CFLAGS	+= $(ACPI_CFLAGS)
 # ACPI Boot-Time Table Parsing
 #
 obj-y				+= tables.o
-obj-y				+= blacklist.o
+obj-$(CONFIG_X86)		+= blacklist.o
 
 #
 # ACPI Core Subsystem (Interpreter)