diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/Makefile | 36 |
2 files changed, 26 insertions, 18 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ccd4dc179..4f5271e97 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-11-18 03:37 mkrufky + + * ../v4l/Makefile: + - em28xx needs tveeprom + - whitespace cleanup - replace some spaces with tabs + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-18 00:56 mkrufky * ../linux/Documentation/video4linux/CARDLIST.cx88: diff --git a/v4l/Makefile b/v4l/Makefile index 56ffc774a..392beb890 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -17,36 +17,36 @@ export-objs += saa7134-core.o saa7134-tvaudio.o # drivers objects bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \ bttv-vbi.o bttv-i2c.o -saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ +saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ saa7134-vbi.o saa7134-tvaudio.o \ saa7134-cards.o saa7134-ts.o saa7134-input.o -cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ - cx88-input.o -cx8800-objs := cx88-video.o cx88-vbi.o -cx8802-objs := cx88-mpeg.o +cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ + cx88-input.o +cx8800-objs := cx88-video.o cx88-vbi.o +cx8802-objs := cx88-mpeg.o tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o list-multi := bttv.o saa7134.o cx88xx.o cx8800.o cx88-alsa.o cx8802.o -em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ +em28xx-objs := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \ em28xx-input.o cx25840-objs := cx25840-core.o cx25840-audio.o cx25840-firmware.o \ - cx25840-vbi.o + cx25840-vbi.o obj-m := video-buf.o v4l1-compat.o v4l2-common.o obj-m += compat_ioctl32.o obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ - cx88-blackbird.o tveeprom.o -obj-$(CONFIG_TVP5150) += tvp5150.o -obj-$(CONFIG_SAA711X) += saa711x.o -obj-$(CONFIG_EM28XX) += em28xx.o -obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o + cx88-blackbird.o tveeprom.o +obj-$(CONFIG_TVP5150) += tvp5150.o +obj-$(CONFIG_SAA711X) += saa711x.o +obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o +obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o # THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!! ifeq ($(CONFIG_VIDEO_ALSA),m) - cx8801-objs := cx88-alsa.o + cx8801-objs := cx88-alsa.o obj-$(CONFIG_VIDEO_CX88) += cx88-alsa.o endif @@ -59,10 +59,10 @@ obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o -obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o -obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \ - mt352.o tda1004x.o sp887x.o nxt6000.o \ - cx24110.o or51211.o nxt200x.o +obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o +obj-$(CONFIG_DVB_FRONTENDS) += cx22702.o dvb-pll.o or51132.o lgdt330x.o \ + mt352.o tda1004x.o sp887x.o nxt6000.o \ + cx24110.o or51211.o nxt200x.o # 2.6-only stuff ifeq ($(VERSION).$(PATCHLEVEL),2.6) @@ -146,7 +146,7 @@ KDIR := /lib/modules/$(KERNELRELEASE)/build PWD := $(shell pwd) DEST := /lib/modules/$(KERNELRELEASE)/$(MDIR) KDIR26 := /lib/modules/$(KERNELRELEASE)/kernel/drivers/media -KDIRUSB := /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media +KDIRUSB := /lib/modules/$(KERNELRELEASE)/kernel/drivers/usb/media ifeq ($(VERSION).$(PATCHLEVEL),2.6) CPPFLAGS := -I$(SUBDIRS)/../linux/include $(CPPFLAGS) -I$(SUBDIRS)/ |