diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-21 10:05:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-21 10:05:12 -0300 |
| commit | 8ed7b8223378e40620c98d03d8ab2102dfab33a0 (patch) | |
| tree | b93ae4f70a4391379d73676c36265bb8f1cdd516 | |
| parent | 74e1ed0781b35cfd53baba71c84dfbf6c59c5403 (diff) | |
| parent | a65cbc3b7aa2eaf072f20f362966f0b0055077b3 (diff) | |
| download | mediapointer-dvb-s2-8ed7b8223378e40620c98d03d8ab2102dfab33a0.tar.gz mediapointer-dvb-s2-8ed7b8223378e40620c98d03d8ab2102dfab33a0.tar.bz2 | |
merge: master
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 6 | ||||
| -rw-r--r-- | v4l/Makefile | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 89d621193..2ed46e87e 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -384,10 +384,10 @@ config VIDEO_WM8739 source "drivers/media/video/cx25840/Kconfig" config VIDEO_SAA711X - tristate "Philips SAA7113/4/5 video decoders (OBSOLETED)" - depends on VIDEO_V4L1 && I2C && EXPERIMENTAL + tristate "Philips SAA7113/4/5 video decoders" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ---help--- - Old support for the Philips SAA7113/4 video decoders. + Support for the Philips SAA7113/4/5 video decoders. To compile this driver as a module, choose M here: the module will be called saa7115. diff --git a/v4l/Makefile b/v4l/Makefile index 27a79a181..58354a035 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -218,8 +218,9 @@ clean:: distclean:: clean -rm -f .version .*.o.flags .*.o.d Makefile.media \ - Kconfig Kconfig.kern .config .config.cmd + Kconfig Kconfig.kern .config .config.cmd .myconfig -rm -rf .tmp_versions + -rm -f scripts/lxdialog scripts/kconfig @find .. -name '*.orig' -exec rm '{}' \; @find .. -name '*.rej' -exec rm '{}' \; |