diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 20:34:14 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 20:34:14 -0500 |
| commit | 4ef679e6caf1261b6380a610a705a90d7e2738c6 (patch) | |
| tree | 6b59360c267508647ae4492f171668ef6ce82e32 /drivers/acpi/Makefile | |
| parent | 98ac62defe529d04a192688f40d801a2d8fbcf98 (diff) | |
| parent | 9a40525788a1b692ee0fc780a8cdb2ac808de1b0 (diff) | |
| download | kernel_samsung_aries-4ef679e6caf1261b6380a610a705a90d7e2738c6.zip kernel_samsung_aries-4ef679e6caf1261b6380a610a705a90d7e2738c6.tar.gz kernel_samsung_aries-4ef679e6caf1261b6380a610a705a90d7e2738c6.tar.bz2 | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index a182434..5984b4f 100644 --- a/drivers/acpi/Makefile +++ b/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) |