diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-06-02 14:51:00 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-06-02 14:51:00 +0000 |
| commit | 414bc92dea59804e639cc713ed45338b4e1f80f7 (patch) | |
| tree | 40fcf3701b19e30794ec7037ad7aeb3e4b446bcc | |
| parent | 8ef31f1a5b037c588a8cc68a1f93ea02a184a974 (diff) | |
| download | upstream-414bc92dea59804e639cc713ed45338b4e1f80f7.tar.gz upstream-414bc92dea59804e639cc713ed45338b4e1f80f7.tar.bz2 upstream-414bc92dea59804e639cc713ed45338b4e1f80f7.zip | |
Use the in-kernel pwc driver, no need to maintain it externally
SVN-Revision: 7450
| -rw-r--r-- | package/kernel/modules/usb.mk | 3 | ||||
| -rw-r--r-- | package/pwc/Makefile | 44 | ||||
| -rw-r--r-- | package/pwc/files/pwc.modules | 1 | ||||
| -rw-r--r-- | package/pwc/patches/100-compile_fix.patch | 24 |
4 files changed, 3 insertions, 69 deletions
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 66425c0457..7ac43c8f0c 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -306,6 +306,9 @@ define KernelPackage/usb-pwc/2.4 FILES:=$(LINUX_DIR)/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX) endef +define KernelPackage/usb-pwc/2.6 + FILES:=$(LINUX_DIR)/drivers/usb/media/pwc/pwc.$(LINUX_KMOD_SUFFIX) +endef $(eval $(call KernelPackage,usb-pwc)) define KernelPackage/usb-net diff --git a/package/pwc/Makefile b/package/pwc/Makefile deleted file mode 100644 index e92b98ba86..0000000000 --- a/package/pwc/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=pwc -PKG_VERSION:=10.0.12-rc1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.saillard.org/linux/pwc/files/ -PKG_MD5SUM:=8763f3d6fd0f9738ef9854de205a126d - -include $(INCLUDE_DIR)/package.mk - -define KernelPackage/pwc - TITLE:=USB Philips camera driver - DESCRIPTION:=Kernel support for USB Philips camera - SUBMENU:=USB Support - DEPENDS:=@BROKEN @LINUX_2_6 @VIDEO_SUPPORT - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) - FILES:=$(PKG_BUILD_DIR)/pwc.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,70,$(shell cat ./files/pwc.modules)) -endef - -define Build/Compile - $(MAKE) -C $(LINUX_DIR) \ - PATH="$(TARGET_PATH)" \ - KVER="$(LINUX_VERSION)" \ - KSRC="$(LINUX_DIR)" \ - SUBDIRS="$(PKG_BUILD_DIR)" \ - KERNEL_DIR="$(KERNEL_DIR)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - modules -endef - -$(eval $(call KernelPackage,pwc)) diff --git a/package/pwc/files/pwc.modules b/package/pwc/files/pwc.modules deleted file mode 100644 index fd02551621..0000000000 --- a/package/pwc/files/pwc.modules +++ /dev/null @@ -1 +0,0 @@ -pwc diff --git a/package/pwc/patches/100-compile_fix.patch b/package/pwc/patches/100-compile_fix.patch deleted file mode 100644 index fc12c75ad8..0000000000 --- a/package/pwc/patches/100-compile_fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur pwc.old/pwc.h pwc.dev/pwc.h ---- pwc.old/pwc.h 2006-04-13 23:38:43.000000000 +0200 -+++ pwc.dev/pwc.h 2007-01-22 02:04:03.872800960 +0100 -@@ -25,7 +25,7 @@ - #ifndef PWC_H - #define PWC_H - --#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/module.h> - #include <linux/usb.h> - #include <linux/spinlock.h> -diff -ur pwc.old/pwc-uncompress.h pwc.dev/pwc-uncompress.h ---- pwc.old/pwc-uncompress.h 2006-01-07 12:57:47.000000000 +0100 -+++ pwc.dev/pwc-uncompress.h 2007-01-22 02:04:18.129633592 +0100 -@@ -30,7 +30,7 @@ - #ifndef PWC_UNCOMPRESS_H - #define PWC_UNCOMPRESS_H - --#include <linux/config.h> -+#include <linux/autoconf.h> - - #include "pwc-ioctl.h" - |