Merge branches 'release' and 'wmi-2.6.25' into release

[pandora-kernel.git] / drivers / misc / Makefile

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 51196c0..1f41654 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -19,3 +19,4 @@ obj-$(CONFIG_SONY_LAPTOP)     += sony-laptop.o
 obj-$(CONFIG_THINKPAD_ACPI)    += thinkpad_acpi.o
 obj-$(CONFIG_FUJITSU_LAPTOP)   += fujitsu-laptop.o
 obj-$(CONFIG_EEPROM_93CX6)     += eeprom_93cx6.o
+obj-$(CONFIG_INTEL_MENLOW)     += intel_menlow.o