Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / char / Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 0326ca1a848a10e492740bf8e7e3baf0cd992d3d..2f56ecc035aa9366ba018074ef1aba24065b3b6b 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -60,6 +60,8 @@ obj-$(CONFIG_BRIQ_PANEL)      += briq_panel.o
 obj-$(CONFIG_PRINTER)          += lp.o
 obj-$(CONFIG_TIPAR)            += tipar.o
 
+obj-$(CONFIG_APM_EMULATION)    += apm-emulation.o
+
 obj-$(CONFIG_DTLK)             += dtlk.o
 obj-$(CONFIG_R3964)            += n_r3964.o
 obj-$(CONFIG_APPLICOM)         += applicom.o
@@ -89,7 +91,7 @@ obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
 obj-$(CONFIG_NSC_GPIO)         += nsc_gpio.o
 obj-$(CONFIG_CS5535_GPIO)      += cs5535_gpio.o
 obj-$(CONFIG_GPIO_VR41XX)      += vr41xx_giu.o
-obj-$(CONFIG_TANBAC_TB0219)    += tb0219.o
+obj-$(CONFIG_GPIO_TB0219)      += tb0219.o
 obj-$(CONFIG_TELCLOCK)         += tlclk.o
 
 obj-$(CONFIG_WATCHDOG)         += watchdog/