diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 16:20:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-09 16:20:19 -0300 |
| commit | dfcaa3ea83ab15bc80c18f7cc0dcec2e04dd2dcc (patch) | |
| tree | 3a258ea3d751e3816c23babc2373627e1a6db462 | |
| parent | 468e72158ba85f7339895fbd7dc5f6e525357326 (diff) | |
| download | mediapointer-dvb-s2-dfcaa3ea83ab15bc80c18f7cc0dcec2e04dd2dcc.tar.gz mediapointer-dvb-s2-dfcaa3ea83ab15bc80c18f7cc0dcec2e04dd2dcc.tar.bz2 | |
Removed uneeded stuff from pwc Makefile
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Also, allow pwc compilation in-tree.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/pwc/Makefile | 17 | ||||
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc.h | 1 | ||||
| -rw-r--r-- | v4l/versions.txt | 1 |
3 files changed, 2 insertions, 17 deletions
diff --git a/linux/drivers/media/video/pwc/Makefile b/linux/drivers/media/video/pwc/Makefile index 8326684f4..33d60126c 100644 --- a/linux/drivers/media/video/pwc/Makefile +++ b/linux/drivers/media/video/pwc/Makefile @@ -1,20 +1,3 @@ -ifneq ($(KERNELRELEASE),) - pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o pwc-timon.o pwc-kiara.o obj-$(CONFIG_USB_PWC) += pwc.o - -else - -KDIR := /lib/modules/$(shell uname -r)/build -PWD := $(shell pwd) - -default: - $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules - -endif - -clean: - rm -f *.[oas] .*.flags *.ko .*.cmd .*.d .*.tmp *.mod.c - rm -rf .tmp_versions - diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h index 1b0ee0ced..74d003695 100644 --- a/linux/drivers/media/video/pwc/pwc.h +++ b/linux/drivers/media/video/pwc/pwc.h @@ -29,6 +29,7 @@ #include <linux/module.h> #include <linux/usb.h> #include <linux/spinlock.h> +#include "compat.h" #include <linux/videodev.h> #include <linux/wait.h> #include <linux/smp_lock.h> diff --git a/v4l/versions.txt b/v4l/versions.txt index 4ee6256c7..cf516d1a4 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -67,6 +67,7 @@ USB_VICAM USB_IBMCAM USB_KONICAWC USB_ET61X251 +USB_PWC [2.6.12] VIDEO_VIVI |