do not overwrite madwifi-ng includes, use madwifi-old directory

[openwrt.git] / openwrt / target / linux / package / spca5xx / patches / 01-kmod-build.patch

diff --git a/openwrt/target/linux/package/spca5xx/patches/01-kmod-build.patch b/openwrt/target/linux/package/spca5xx/patches/01-kmod-build.patch
index 5aeca16..304df92 100644 (file)
--- a/openwrt/target/linux/package/spca5xx/patches/01-kmod-build.patch
+++ b/openwrt/target/linux/package/spca5xx/patches/01-kmod-build.patch
@@ -1,7 +1,18 @@
-diff -ruN spca5xx-20051105-old/Makefile spca5xx-20051105-new/Makefile
---- spca5xx-20051105-old/Makefile      2005-11-05 19:18:26.000000000 +0100
-+++ spca5xx-20051105-new/Makefile      2005-12-08 21:50:20.000000000 +0100
-@@ -68,157 +68,18 @@
+diff -Nur spca5xx-20051212/Makefile spca5xx-20051212.patched/Makefile
+--- spca5xx-20051212/Makefile  2005-12-10 17:05:51.000000000 +0100
++++ spca5xx-20051212.patched/Makefile  2005-12-25 02:41:29.910720750 +0100
+@@ -33,7 +33,9 @@
+ DEFINES   += -DCONFIG_USB_SPCA5XX_MODULE=1 -DMODULE -D__KERNEL__
+ DEFINES   += -DVID_HARDWARE_SPCA5XX=0xFF -DSPCA5XX_VERSION=\"$(VERSION)\"
+ 
+-ifneq ($(shell uname -r | cut -d. -f1,2), 2.4)
++KERNELVERSION=$(shell uname -r | cut -d. -f1,2)
++
++ifneq ($(KERNELVERSION), 2.4)
+ 
+ ifneq ($(KERNELRELEASE),)   # We were called by kbuild
+ CFLAGS += $(DEFINES) 
+@@ -68,152 +70,16 @@
  
  else   # kernel version test
  
@@ -61,8 +72,6 @@ diff -ruN spca5xx-20051105-old/Makefile spca5xx-20051105-new/Makefile
 -             drivers/usb/Config.in \
 -             drivers/usb/spcadecoder.c \
 -             drivers/usb/spcadecoder.h \
--             drivers/usb/jpeg_header.h \
--           drivers/usb/jpeg_qtables.h \
 -           drivers/usb/spcagamma.h \
 -           drivers/usb/spcaCompat.h \
 -           drivers/usb/spcausb.h \
@@ -152,20 +161,17 @@ diff -ruN spca5xx-20051105-old/Makefile spca5xx-20051105-new/Makefile
 -
 -drivers/usb/spcadecoder.o: drivers/usb/spcadecoder.h \
 -                         drivers/usb/spcagamma.h \
--                           drivers/usb/jpeg_header.h
+-                          
 +EXTRA_CFLAGS += $(DEFINES) 
- 
--endif  # End kernel version test
++  
 +spca5xx-objs := drivers/usb/spca5xx.o drivers/usb/spcadecoder.o 
-+
++  
 +obj-m += spca5xx.o
 +obj-y := $(spca5xx-objs)
-+
++  
 +O_TARGET := $(obj-m)
- 
++  
 +-include $(TOPDIR)/Rules.make
-+
-+endif  # End kernel version test
  
- ############################################################################## 
- # OTHER TARGETS 
+ endif  # End kernel version test
+