Upgrade rt2500 to a CVS snapshot, builds again on 2.6

SVN-Revision: 7576

diff --git a/package/rt2500/Makefile b/package/rt2500/Makefile
index fb6d59451627b1e20e5a5861385b5eb9864e157b..b4729ce184cb58e27ce879f4eab5cde804b41e60 100644 (file)
--- a/package/rt2500/Makefile
+++ b/package/rt2500/Makefile
@@ -10,19 +10,19 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=rt2500
-PKG_VERSION:=1.1.0-b4
+PKG_VERSION:=cvs-2007061115
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/rt2400
-PKG_MD5SUM:=83b8b9a091705c08d99268479f3b3b6a
+PKG_SOURCE_URL:=@openwrt/
+PKG_MD5SUM:=67a158b24ec46e37edc4545f51338bb9
 
 include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/rt2500
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for ralink pci wireless chipsets
-  DEPENDS:=@LINUX_2_4 @USB_SUPPORT +wireless-tools
+  DEPENDS:=@USB_SUPPORT +wireless-tools
   DESCRIPTION:=\
        This package contains a driver for ralink rt2500 pci chipsets.
   URL:=http://rt2x00.serialmonkey.com/

diff --git a/package/rt2500/patches/001-rt2561t.patch b/package/rt2500/patches/001-rt2561t.patch
index ca0722161232f30ae84af6d8bf68558a9863e422..5b834325808425b30c714e0dd3601003ce86674d 100644 (file)
--- a/package/rt2500/patches/001-rt2561t.patch
+++ b/package/rt2500/patches/001-rt2561t.patch
@@ -1,29 +1,18 @@
-Index: rt2500-1.1.0-b4/Module/rt_config.h
-===================================================================
---- rt2500-1.1.0-b4.orig/Module/rt_config.h    2007-06-04 13:22:53.001797784 +0200
-+++ rt2500-1.1.0-b4/Module/rt_config.h 2007-06-04 13:22:53.074786688 +0200
-@@ -55,7 +55,7 @@
- #error  You must compile this driver with "-O".
- #endif
- 
--#include <linux/config.h>  //can delete
-+#include <linux/autoconf.h>  //can delete
- #include <linux/module.h>
- #include <linux/version.h>
- #include <linux/kernel.h>
-@@ -154,6 +154,7 @@
+diff -urN rt2500-cvs-2007061115.new/Module/rt_config.h rt2500-cvs-2007061115/Module/rt_config.h
+--- rt2500-cvs-2007061115.new/Module/rt_config.h       2007-06-11 22:35:28.000000000 +0200
++++ rt2500-cvs-2007061115/Module/rt_config.h   2007-06-11 22:57:31.000000000 +0200
+@@ -153,6 +153,7 @@
  
  enum rt2560_chips {
      RT2560A = 0,
 +    RT2561T = 0,
  };
  
- #ifdef RTMP_EMBEDDED
-Index: rt2500-1.1.0-b4/Module/rtmp_main.c
-===================================================================
---- rt2500-1.1.0-b4.orig/Module/rtmp_main.c    2007-06-04 13:22:53.008796720 +0200
-+++ rt2500-1.1.0-b4/Module/rtmp_main.c 2007-06-04 13:22:53.074786688 +0200
-@@ -975,6 +975,7 @@
+ #if 1                         //#ifdef RTMP_EMBEDDED
+diff -urN rt2500-cvs-2007061115.new/Module/rtmp_main.c rt2500-cvs-2007061115/Module/rtmp_main.c
+--- rt2500-cvs-2007061115.new/Module/rtmp_main.c       2007-05-29 05:49:17.000000000 +0200
++++ rt2500-cvs-2007061115/Module/rtmp_main.c   2007-06-11 22:57:13.000000000 +0200
+@@ -1041,6 +1041,7 @@
  static struct pci_device_id rt2500_pci_tbl[] __devinitdata =
  {
      {0x1814, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RT2560A},