diff options
| author | Rene Wagner <rw@handhelds.org> | 2005-12-19 21:17:48 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-12-19 21:17:48 +0000 |
| commit | 968fa5b91a65c55599ed4fa2f07bf5c81e407b3e (patch) | |
| tree | 55186d774cb93527914f232e9c6356ef656d9c6f | |
| parent | 87fbff5a976b9fadafe520429107d531ff5b7833 (diff) | |
atmelwlandriver 3.4.1.0: fix build for h3600. patch courtesy of Erik Hovland. fixes Bug #542.
3 files changed, 16 insertions, 7 deletions
diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch index 7059504799..96e2cd947f 100644 --- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch +++ b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/fix-kernel-version-test-for-hh.patch @@ -1,12 +1,21 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh/src/usb/vnetusba.c ---- atmelwlandriver-3.4.1.0/src/usb/vnetusba.c 2004-11-10 01:40:50.000000000 -0800 -+++ atmelwlandriver-3.4.1.0-hh/src/usb/vnetusba.c 2005-11-29 14:48:49.632112829 -0800 +--- atmelwlandriver-3.4.1.0/src/usb/vnetusba.c 2005-12-02 10:25:21.946561154 -0800 ++++ atmelwlandriver-3.4.1.0-hh/src/usb/vnetusba.c 2005-12-19 11:34:38.070346125 -0800 @@ -72,7 +72,7 @@ #endif struct usb_driver vnet_driver = { -#if LINUX_VERSION_CODE < 0x020415 -+#if (LINUX_VERSION_CODE < 0x020415) && !defined(CONFIG_ARCH_H5400) ++#if (LINUX_VERSION_CODE < 0x020415) && !defined(CONFIG_IPAQ_HANDHELD) owner : THIS_MODULE, #endif #if defined(RFMD) +@@ -2174,7 +2174,7 @@ + return NULL; + } + */ +-#if (LINUX_VERSION_CODE < 0x020413) ++#if (LINUX_VERSION_CODE < 0x020413) && !defined(CONFIG_IPAQ_HANDHELD) + if (!register_netdev(Adapter->net)) { + err("register_netdev failed"); + #else diff --git a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch index b2a515eec1..0ac06f1482 100644 --- a/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch +++ b/packages/atmelwlandriver/atmelwlandriver-3.4.1.0/power-on-and-leds.patch @@ -5,7 +5,7 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh #include "vnetioctl.h" #include "config.h" -+#ifdef CONFIG_IPAQ_HANDHELD ++#ifdef CONFIG_ARCH_H5400 +#include <asm/mach-types.h> +#include <asm/arch/ipaq.h> +#include <asm/arch-pxa/h5400-asic.h> @@ -49,7 +49,7 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh return 0; } -+#ifdef CONFIG_IPAQ_HANDHELD ++#ifdef CONFIG_ARCH_H5400 +static struct timer_list led_timer; + +static void @@ -73,7 +73,7 @@ diff -Nurd atmelwlandriver-3.4.1.0/src/usb/vnetusba.c atmelwlandriver-3.4.1.0-hh + + init_timer (&led_timer); +} -+#endif /* CONFIG_IPAQ_HANDHELD */ ++#endif /* CONFIG_ARCH_H5400*/ + static int usb_vnet_tx(struct sk_buff *skb, struct net_device *dev) { diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb index 7da172aafd..333d8f12ec 100644 --- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb +++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb @@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/atmelwlandriver/atmelwlandriver-${PV}.tar.bz2 \ file://fix-kernel-version-test-for-hh.patch;patch=1" S = "${WORKDIR}/atmelwlandriver" LICENSE = "GPL" -PR = "r1" +PR = "r2" inherit module SECTION = "base" |