Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[~andy/linux] / drivers / char / Makefile

diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 2d68054f97954402095051600529754b0f4b3e56..a324f9303e36da8e9c63c423f3405d777f05cdbb 100644 (file)
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_MSM_SMD_PKT)     += msm_smd_pkt.o
 obj-$(CONFIG_MSPEC)            += mspec.o
 obj-$(CONFIG_MMTIMER)          += mmtimer.o
 obj-$(CONFIG_UV_MMTIMER)       += uv_mmtimer.o
-obj-$(CONFIG_VIOTAPE)          += viotape.o
 obj-$(CONFIG_IBM_BSR)          += bsr.o
 obj-$(CONFIG_SGI_MBCS)         += mbcs.o
 obj-$(CONFIG_BFIN_OTP)         += bfin-otp.o