From 4efa67b05540ab3eb14daa2c8e3df478887fd7bb Mon Sep 17 00:00:00 2001
From: tommat <tommat@pld-linux.org>
Date: Mon, 17 Apr 2006 13:06:11 +0000
Subject: [PATCH] - make it build with new kernel

Changed files:
    atmelwlandriver-usb-api.patch -> 1.2
    atmelwlandriver.spec -> 1.43
---
 atmelwlandriver-usb-api.patch | 14 ++++++++++++++
 atmelwlandriver.spec          | 26 ++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/atmelwlandriver-usb-api.patch b/atmelwlandriver-usb-api.patch
index f52281b..c51ec7b 100644
--- a/atmelwlandriver-usb-api.patch
+++ b/atmelwlandriver-usb-api.patch
@@ -16,3 +16,17 @@
  		}
  	}
  			     
+diff -Nur atmelwlandriver-orig/src/usb/vnetusba.c atmelwlandriver/src/usb/vnetusba.c
+--- atmelwlandriver-orig/src/usb/vnetusba.c	2006-04-11 12:38:57.516432000 +0200
++++ atmelwlandriver/src/usb/vnetusba.c	2006-04-17 14:53:11.006174500 +0200
+@@ -2254,6 +2254,10 @@
+ 		del_timer_sync(Adapter->CtrlTimer);
+ 	}
+ 
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13)) 
++#define URB_ASYNC_UNLINK 0
++#endif
++
+ #if (LINUX_VERSION_CODE < 0x020500)
+ 	Adapter->rx_urb->transfer_flags &= ~USB_ASYNC_UNLINK;
+ 	Adapter->tx_urb->transfer_flags &= ~USB_ASYNC_UNLINK;
diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index e286464..1baf8b5 100644
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -172,24 +172,30 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 		exit 1
 	fi
 	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+	install -d o/include/{linux,config}
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
 
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} pcmcia buildonly=release \
 		KERNEL_VERSION=%{__kernel_ver} \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} usb buildonly=release \
 		KERNEL_VERSION=%{__kernel_ver} \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 
 	mv -f objs/*/release/*.ko built/$cfg
@@ -203,7 +209,7 @@ done
 
 %{__make} lvnet \
 	OPT="%{rpmcflags} %{rpmldflags}" \
-	INCDIR=%{_includedir}
+	INCDIR=%{_includedir} \
 
 %{__make} -C src/apps/fw-upgrade atmelup \
 	CCC="%{__cc}" \
-- 
2.43.0