diff options
| author |   Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-04-19 20:38:13 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-04-19 20:38:13 -0400 |
| commit | 03414e57ad9875d0c8bfa5a4a65813cb2157372e (patch) | |
| tree | 836db238d42a6282a5ac2241363eb8b6db190ab7 /drivers/misc/Makefile | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 (diff) | |
| parent | tclib: Fix compile warnings (diff) | |
| download | linux-dev-03414e57ad9875d0c8bfa5a4a65813cb2157372e.tar.xz linux-dev-03414e57ad9875d0c8bfa5a4a65813cb2157372e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/tclib into base
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index bbc69fdd1b9d..4581b2533111 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_ACER_WMI) += acer-wmi.o obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o obj-$(CONFIG_ATMEL_PWM) += atmel_pwm.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o +obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o obj-$(CONFIG_LKDTM) += lkdtm.o obj-$(CONFIG_TIFM_CORE) += tifm_core.o |