diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /drivers/char/Makefile | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 08f69287ea36..4aeae687e88a 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
| @@ -82,6 +82,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o | |||
| 82 | obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o | 82 | obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o |
| 83 | obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o | 83 | obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o |
| 84 | obj-$(CONFIG_TANBAC_TB0219) += tb0219.o | 84 | obj-$(CONFIG_TANBAC_TB0219) += tb0219.o |
| 85 | obj-$(CONFIG_TELCLOCK) += tlclk.o | ||
| 85 | 86 | ||
| 86 | obj-$(CONFIG_WATCHDOG) += watchdog/ | 87 | obj-$(CONFIG_WATCHDOG) += watchdog/ |
| 87 | obj-$(CONFIG_MWAVE) += mwave/ | 88 | obj-$(CONFIG_MWAVE) += mwave/ |