summaryrefslogtreecommitdiffstats
path: root/drivers/char/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r--drivers/char/Makefile20
1 files changed, 16 insertions, 4 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 9e3ffd93a..32c66c442 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -38,7 +38,7 @@ obj-y += tty_io.o n_tty.o tty_ioctl.o mem.o raw.o pty.o misc.o random.o
export-objs := busmouse.o console.o i2c-old.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o videodev.o \
- tty_io.o
+ tty_io.o bttv.o
KEYMAP =defkeymap.o
KEYBD =pc_keyb.o
@@ -61,6 +61,20 @@ ifeq ($(ARCH),arm)
SERIAL =
endif
+ifeq ($(ARCH),sh)
+ KEYMAP =
+ KEYBD =
+ CONSOLE =
+ SERIAL =
+ ifeq ($(CONFIG_SERIAL),y)
+ SERIAL = generic_serial.o sh-sci.o
+ else
+ ifeq ($(CONFIG_SERIAL),m)
+ SERIAL = sh-sci.o
+ endif
+ endif
+endif
+
ifeq ($(CONFIG_DECSTATION),y)
KEYBD =
SERIAL =
@@ -180,13 +194,11 @@ else
endif
endif
-obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tda8425.o tda9855.o tea6300.o
+obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tda8425.o tda985x.o tea6300.o
ifeq ($(CONFIG_VIDEO_BT848),y)
-L_I2C=y
L_TUNERS=y
else
ifeq ($(CONFIG_VIDEO_BT848),m)
- L_I2C=m
L_TUNERS=m
endif
endif