From: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Date: Fri, 9 Jun 2006 12:49:07 +0000 (+0000)
Subject: ixp4xx-csr: added patch to make paremeter livelock_dispatcher non-static
X-Git-Tag: Release-2010-05/1~9453^2~1479^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7780892de1e4ea7f50746e735c50e6d14f8199ef;p=openembedded.git

ixp4xx-csr: added patch to make paremeter livelock_dispatcher non-static
	needed to compile with gcc 4.1.1; without it one gets
	ixp400: falsely claims to have parameter livelock_dispatcher
	and the module does not load...
---

diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch b/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch
new file mode 100644
index 0000000000..0b4e4ba026
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-csr-2.1/livelock.patch
@@ -0,0 +1,19 @@
+*** ixp400_xscale_sw/src/oslinux/IxLinuxInit.c.orig	Sun Sep 25 05:59:03 2005
+--- ixp400_xscale_sw/src/oslinux/IxLinuxInit.c	Fri Jun  9 14:07:06 2006
+***************
+*** 91,97 ****
+  
+  
+  /* Module parameters */
+! static int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/
+  
+  MODULE_PARM(livelock_dispatcher, "i");
+  MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher");
+--- 91,97 ----
+  
+  
+  /* Module parameters */
+! int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/
+  
+  MODULE_PARM(livelock_dispatcher, "i");
+  MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher");
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index 53cd2ba8fb..567728b40f 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -35,10 +35,11 @@ SRC_URI += "file://mii-debug.patch;patch=1"
 SRC_URI += "file://rtl8201-support.patch;patch=1"
 SRC_URI += "file://gcc4.patch;patch=1"
 SRC_URI += "file://oe-makefile.patch;patch=1"
+SRC_URI += "file://livelock.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r9"
+PR = "r10"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"