diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-07 03:19:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:19:43 -0500 |
| commit | 060195500e0347a6ba8ea89739a9898961eb6f2b (patch) | |
| tree | 5afba4e8daae642d33b7a4daa97d63c54776b786 /drivers/misc/Makefile | |
| parent | 26b6f2236615649a0ae6a0de2e9e71a2f9ffeba7 (diff) | |
| parent | dd8cd7793781c87be47bbfee65efa3fb5110f898 (diff) | |
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 | |||
| 6 | obj-$(CONFIG_IBM_ASM) += ibmasm/ | 6 | obj-$(CONFIG_IBM_ASM) += ibmasm/ |
| 7 | obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ | 7 | obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ |
| 8 | obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o | 8 | obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o |
| 9 | obj-$(CONFIG_ACER_WMI) += acer-wmi.o | ||
| 9 | obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o | 10 | obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o |
| 10 | obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o | 11 | obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o |
| 12 | obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o | ||
| 11 | obj-$(CONFIG_LKDTM) += lkdtm.o | 13 | obj-$(CONFIG_LKDTM) += lkdtm.o |
| 12 | obj-$(CONFIG_TIFM_CORE) += tifm_core.o | 14 | obj-$(CONFIG_TIFM_CORE) += tifm_core.o |
| 13 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o | 15 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o |