update zd1211 to r83, fix build on 2.6.19

SVN-Revision: 5802
owl
Nicolas Thill 2006-12-15 18:21:04 +00:00
parent 16f60533f7
commit e888f84a02
2 changed files with 48 additions and 2 deletions

View File

@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=zd1211 PKG_NAME:=zd1211
PKG_VERSION:=r69 PKG_VERSION:=r83
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=http://zd1211.ath.cx/download/ PKG_SOURCE_URL:=http://zd1211.ath.cx/download/
PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a PKG_MD5SUM:=a5751f0e6f1f368689077fa7758a4932
PKG_CAT:=zcat PKG_CAT:=zcat
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION)

View File

@ -0,0 +1,46 @@
diff -bruN zd1211-driver-r69-old/src/zd1205.c zd1211-driver-r69-new/src/zd1205.c
--- zd1211-driver-r69-old/src/zd1205.c 2006-03-18 12:14:33.000000000 +0100
+++ zd1211-driver-r69-new/src/zd1205.c 2006-12-15 19:03:55.000000000 +0100
@@ -31,7 +31,7 @@
* -------------------------------------------------------------------- */
#define __KERNEL_SYSCALLS__
-#include <linux/config.h>
+#include <linux/autoconf.h>
#include <net/checksum.h>
#include <linux/tcp.h>
#include <linux/udp.h>
diff -bruN zd1211-driver-r69-old/src/zd1205_proc.c zd1211-driver-r69-new/src/zd1205_proc.c
--- zd1211-driver-r69-old/src/zd1205_proc.c 2006-02-13 13:50:12.000000000 +0100
+++ zd1211-driver-r69-new/src/zd1205_proc.c 2006-12-15 19:04:02.000000000 +0100
@@ -30,7 +30,7 @@
*
* -------------------------------------------------------------------- */
-#include <linux/config.h>
+#include <linux/autoconf.h>
#ifdef CONFIG_PROC_FS
#include "zd1205.h"
diff -bruN zd1211-driver-r69-old/src/zd1211.c zd1211-driver-r69-new/src/zd1211.c
--- zd1211-driver-r69-old/src/zd1211.c 2006-02-16 22:33:51.000000000 +0100
+++ zd1211-driver-r69-new/src/zd1211.c 2006-12-15 19:03:16.000000000 +0100
@@ -30,7 +30,7 @@
*
* -------------------------------------------------------------------- */
-#include <linux/config.h>
+#include <linux/autoconf.h>
#include <net/checksum.h>
#include <linux/tcp.h>
#include <linux/udp.h>
@@ -1878,7 +1878,9 @@
dev->get_stats = zd1205_get_stats;
#if ZDCONF_WE_STAT_SUPPORT == 1
+# if WIRELESS_EXT < 21
dev->get_wireless_stats = zd1205_iw_getstats;
+# endif
#elif !defined(ZDCONF_WE_STAT_SUPPORT)
#error "Undefine ZDCONF_WE_STAT_SUPPORT"
#endif