summaryrefslogtreecommitdiff
path: root/drivers/misc/Makefile
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:19:43 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:19:43 -0500
commit060195500e0347a6ba8ea89739a9898961eb6f2b (patch)
tree5afba4e8daae642d33b7a4daa97d63c54776b786 /drivers/misc/Makefile
parent26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (diff)
parentdd8cd7793781c87be47bbfee65efa3fb5110f898 (diff)
Merge branches 'release' and 'wmi-2.6.25' into release
Diffstat (limited to 'drivers/misc/Makefile')
-rw-r--r--drivers/misc/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index a9e8faffc1b1..1f41654aae4d 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -6,8 +6,10 @@ obj- := misc.o # Dummy rule to force built-in.o to be made
obj-$(CONFIG_IBM_ASM) += ibmasm/
obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
+obj-$(CONFIG_ACER_WMI) += acer-wmi.o
obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o
+obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
obj-$(CONFIG_LKDTM) += lkdtm.o
obj-$(CONFIG_TIFM_CORE) += tifm_core.o
obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o