diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/misc/Makefile | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index c1bf1fb04c5c..c9e98ab021c5 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile | |||
| @@ -5,4 +5,8 @@ obj- := misc.o # Dummy rule to force built-in.o to be made | |||
| 5 | 5 | ||
| 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_LKDTM) += lkdtm.o | 9 | obj-$(CONFIG_LKDTM) += lkdtm.o |
| 10 | obj-$(CONFIG_TIFM_CORE) += tifm_core.o | ||
| 11 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o | ||
| 12 | obj-$(CONFIG_SGI_IOC4) += ioc4.o | ||