summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-11 21:13:08 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-11 21:13:08 +0000
commit8aa266f828a40ac685da11c90d036fe9a988d77b (patch)
tree7db929808a25010fb07f1d213ff4b0773e377a60
parent6cd3ee4d8f6116854a845cf702f3ddaf4b5d2a5e (diff)
fix 2.4 build error introduced by changeset:2606
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2613 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/package/spca5xx/Makefile1
-rw-r--r--target/linux/package/spca5xx/patches/01-kmod-build.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/package/spca5xx/Makefile b/target/linux/package/spca5xx/Makefile
index 95a48a9a30..d61a04a80c 100644
--- a/target/linux/package/spca5xx/Makefile
+++ b/target/linux/package/spca5xx/Makefile
@@ -18,6 +18,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
ifeq ($(KERNEL_DIR),)
KERNEL_DIR:=$(LINUX_DIR)
endif
+KERNEL_VERSION=$(shell echo "$(LINUX_VERSION)" | cut -d. -f1,2)
include $(TOPDIR)/package/rules.mk
diff --git a/target/linux/package/spca5xx/patches/01-kmod-build.patch b/target/linux/package/spca5xx/patches/01-kmod-build.patch
index f69caf8b91..eb7dccd32e 100644
--- a/target/linux/package/spca5xx/patches/01-kmod-build.patch
+++ b/target/linux/package/spca5xx/patches/01-kmod-build.patch
@@ -26,7 +26,7 @@ diff -ruN spca5xx-20051105-old/Makefile spca5xx-20051105-new/Makefile
-# This makefile will build the spca50x driver module external to the kernel
-# source tree. It makes it easier to swap kernels.
-
-+CFLAGS += $(DEFINES)
++EXTRA_CFLAGS += $(DEFINES)
-KERNEL_VERSION = `uname -r`
+spca5xx-objs := drivers/usb/spca5xx.o drivers/usb/spcadecoder.o