diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 20:04:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-17 20:04:17 -0300 |
| commit | 0aafae9080d12790fd679bc133e3e6679209c48d (patch) | |
| tree | c7ba45f6995002f4eff4de79558d8132c5cb7a75 /v4l | |
| parent | f0247cd71514d266ebf944e17f860f314773e6e9 (diff) | |
| parent | 8f0f86249bec74bed8cdcc2c9e587990e2a1d003 (diff) | |
| download | mediapointer-dvb-s2-0aafae9080d12790fd679bc133e3e6679209c48d.tar.gz mediapointer-dvb-s2-0aafae9080d12790fd679bc133e3e6679209c48d.tar.bz2 | |
Merge from manu tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 178122097..fd757e928 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -310,9 +310,7 @@ inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko sa #inst_video += bt87x.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko inst_video += video-buf.ko video-buf-dvb.ko -ifeq ($(CONFIG_VIDEO_DEV),m) inst_video += videodev.ko -endif inst_video += ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko |