diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Makefile | 16 | ||||
| -rw-r--r-- | v4l/versions.txt | 14 |
2 files changed, 12 insertions, 18 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 8e4170277..ad1f1ac23 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -189,11 +189,11 @@ clean:: @find . -name '*.c' -type l -exec rm '{}' \; @find . -name '*.h' -type l -exec rm '{}' \; -rm -f *~ *.o *.ko .*.o.cmd .*.ko.cmd *.mod.c av7110_firm.h fdump \ - ivtv-svnversion.h \ - Kconfig Kconfig.kern .config .config.cmd + ivtv-svnversion.h distclean:: clean - -rm -f .version .*.o.flags .*.o.d Makefile.media + -rm -f .version .*.o.flags .*.o.d Makefile.media \ + Kconfig Kconfig.kern .config .config.cmd -rm -rf .tmp_versions @find .. -name '*.orig' -exec rm '{}' \; @find .. -name '*.rej' -exec rm '{}' \; @@ -233,7 +233,15 @@ config:: links .version menuconfig:: links .version ./scripts/make_kconfig.pl - -ln -s /usr/src/linux-2.6.16/scripts/kconfig scripts/ + -rm scripts/lxdialog scripts/kconfig + -if [ -d $(KDIR)/scripts/lxdialog ]; then \ + ln -s $(KDIR)/scripts/lxdialog scripts/lxdialog; \ + fi + + -if [ -d $(KDIR)/scripts/kconfig ]; then \ + ln -s $(KDIR)/scripts/kconfig scripts/kconfig; \ + fi + $(KDIR)/scripts/kconfig/mconf Kconfig ./scripts/make_noconfig.pl diff --git a/v4l/versions.txt b/v4l/versions.txt index 255a31b17..c6c0ecd3b 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -10,16 +10,6 @@ VIDEO_PLANB VIDEO_VINO VIDEO_M32R_AR_M64278 -[2.6.16] -VIDEO_USBVIDEO -USB_VICAM -USB_IBMCAM -USB_KONICAWC -USB_ET61X251 -USB_PWC -USB_SN9C102 -USB_ZC0301 - [2.6.14] VIDEO_ZORAN VIDEO_ZORAN_BUZ @@ -76,11 +66,7 @@ RADIO_ZOLTRIX RADIO_ZOLTRIX_PORT [2.6.12] -VIDEO_VIVI VIDEO_DEV -VIDEO_V4L1 -VIDEO_V4L2 -VIDEO_V4L1_COMPAT VIDEO_ADV_DEBUG VIDEO_BT848 VIDEO_BT848_DVB |