Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[sfrench/cifs-2.6.git] / drivers / platform / mips / Makefile

diff --git a/drivers/platform/mips/Makefile b/drivers/platform/mips/Makefile
index 43412849b195deaf5e40f69d642c0fbfbd8e126f..8dfd03924c3701e5d36a164740a6da57fdc9e3cf 100644 (file)
--- a/drivers/platform/mips/Makefile
+++ b/drivers/platform/mips/Makefile
@@ -1,2 +1 @@
-obj-$(CONFIG_MIPS_ACPI) += acpi_init.o
 obj-$(CONFIG_CPU_HWMON) += cpu_hwmon.o