Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

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

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 4c1c584e9eb678d366e575a3cd983b287d4419e0..0e0d12a064622c3d3167e2db6cff59336dbe20d5 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -57,6 +57,7 @@ obj-$(CONFIG_MMTIMER)         += mmtimer.o
 obj-$(CONFIG_VIOCONS)          += viocons.o
 obj-$(CONFIG_VIOTAPE)          += viotape.o
 obj-$(CONFIG_HVCS)             += hvcs.o
+obj-$(CONFIG_IBM_BSR)          += bsr.o
 obj-$(CONFIG_SGI_MBCS)         += mbcs.o
 obj-$(CONFIG_BRIQ_PANEL)       += briq_panel.o
 obj-$(CONFIG_BFIN_OTP)         += bfin-otp.o
@@ -101,7 +102,6 @@ obj-$(CONFIG_TELCLOCK)              += tlclk.o
 
 obj-$(CONFIG_MWAVE)            += mwave/
 obj-$(CONFIG_AGP)              += agp/
-obj-$(CONFIG_DRM)              += drm/
 obj-$(CONFIG_PCMCIA)           += pcmcia/
 obj-$(CONFIG_IPMI_HANDLER)     += ipmi/