aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-01-07 23:29:43 +0000
committerNicolas Thill <nico@openwrt.org>2007-01-07 23:29:43 +0000
commite9b2fe8f02e861bfacea2688851d72347661c88e (patch)
tree4b02cee1f1d22c24ebe5a70e112e6aefda10ad51
parent14b000385cc0d2c421e4881572346f2737c9ae7f (diff)
downloadupstream-e9b2fe8f02e861bfacea2688851d72347661c88e.tar.gz
upstream-e9b2fe8f02e861bfacea2688851d72347661c88e.tar.bz2
upstream-e9b2fe8f02e861bfacea2688851d72347661c88e.zip
fix rt61 build on 2.4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6022 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/rt61/Makefile6
-rw-r--r--package/rt61/patches/02-linux_2_4_module_param.patch22
2 files changed, 26 insertions, 2 deletions
diff --git a/package/rt61/Makefile b/package/rt61/Makefile
index d685119b6b..0656cf4c43 100644
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/rt61
SUBMENU:=Wireless Drivers
TITLE:=Driver for ralink MiMo pci chipsets
- DEPENDS:=@LINUX_2_4 @USB_SUPPORT +wireless-tools
+ DEPENDS:=@LINUX_2_4 @PCI_SUPPORT +wireless-tools
DESCRIPTION:=\
This package contains a driver for ralink rt61xx pci chipsets.
URL:=http://rt2x00.serialmonkey.com/
@@ -34,11 +34,13 @@ define KernelPackage/rt61
AUTOLOAD:=$(call AutoLoad,50,rt61)
endef
+LINUX_PATCHLEVEL:=$(shell echo "$(LINUX_VERSION)" | cut -d. -f2)
+
define Build/Compile
$(MAKE) -C $(LINUX_DIR) \
ARCH="$(LINUX_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
- PATCHLEVEL="$(LINUX_VERSION)" \
+ PATCHLEVEL="$(LINUX_PATCHLEVEL)" \
KERNDIR="$(LINUX_DIR)" \
SUBDIRS="$(PKG_BUILD_DIR)/Module" \
modules
diff --git a/package/rt61/patches/02-linux_2_4_module_param.patch b/package/rt61/patches/02-linux_2_4_module_param.patch
new file mode 100644
index 0000000000..ee773a856a
--- /dev/null
+++ b/package/rt61/patches/02-linux_2_4_module_param.patch
@@ -0,0 +1,22 @@
+--- rt61-old/Module/rtmp_main.c 2006/06/16 11:12:40 1.14
++++ rt61-new/Module/rtmp_main.c 2006/08/12 13:03:25 1.15
+@@ -48,11 +48,19 @@
+ // Global variable, debug level flag
+ // Don't hide this behing debug define. There should be as little difference between debug and no-debug as possible.
+ int debug = 0;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ module_param(debug, int, 0444);
++#else
++MODULE_PARM(debug, "i");
++#endif
+ MODULE_PARM_DESC(debug, "Enable level: accepted values: 1 to switch debug on, 0 to switch debug off.");
+
+ static char *ifname = NULL ;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ module_param(ifname, charp, 0444);
++#else
++MODULE_PARM(ifname, "s");
++#endif
+ MODULE_PARM_DESC(ifname, "Network device name (default ra%d)");
+
+ static dma_addr_t dma_adapter;