diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /drivers/char/Makefile | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 30e649ac0..9bba10cf4 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -38,7 +38,10 @@ 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 bttv.o cpia.o + tty_io.o bttv-if.o cpia.o + +list-multi := bttv.o +bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o KEYMAP =defkeymap.o KEYBD =pc_keyb.o @@ -62,9 +65,11 @@ ifeq ($(ARCH),m68k) endif ifeq ($(ARCH),arm) +# we actually need to be able to select various different keymaps +# and keyboards dependent on which actual machine we're going to +# run on. KEYMAP = KEYBD = - CONSOLE = endif ifeq ($(ARCH),sh) @@ -371,6 +376,8 @@ O_OBJS := $(filter-out $(export-objs), $(obj-y)) OX_OBJS := $(filter $(export-objs), $(obj-y)) M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m))) MX_OBJS := $(sort $(filter $(export-objs), $(obj-m))) +MI_OBJS := $(sort $(filter-out $(export-objs), $(int-m))) +MIX_OBJS := $(sort $(filter $(export-objs), $(int-m))) include $(TOPDIR)/Rules.make @@ -389,3 +396,7 @@ defkeymap.c: defkeymap.map zoran.o: zr36120.o zr36120_i2c.o zr36120_mem.o $(LD) $(LD_RFLAG) -r -o $@ zr36120.o zr36120_i2c.o zr36120_mem.o + +bttv.o: $(bttv-objs) + $(LD) $(LD_RFLAG) -r -o $@ $(bttv-objs) + |