diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 09:19:43 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 09:19:43 +0100 |
| commit | 060195500e0347a6ba8ea89739a9898961eb6f2b (patch) | |
| tree | 5afba4e8daae642d33b7a4daa97d63c54776b786 /drivers/misc/Makefile | |
| parent | Merge branches 'release' and 'menlo' into release (diff) | |
| parent | tc1100-wmi: Add driver for HP Compaq TC1100 Tablets (diff) | |
| download | linux-060195500e0347a6ba8ea89739a9898961eb6f2b.tar.xz linux-060195500e0347a6ba8ea89739a9898961eb6f2b.zip | |
Merge branches 'release' and 'wmi-2.6.25' into release
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 2 |
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 |