summaryrefslogtreecommitdiff
path: root/packages/ixp4xx
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-06-19 23:33:38 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-19 23:33:38 +0000
commit2d179ec6ae3fbe132ef6a1098014a238928304ae (patch)
tree5c6f27cbd91cd49a215edd52476d1ace41649037 /packages/ixp4xx
parent0156fa8505334347b253a7c8249da13aa682d58d (diff)
ixp4xx, ixp425-eth: Updated for 2.6.17 kernel (MODULE_PARM now removed)
Diffstat (limited to 'packages/ixp4xx')
-rw-r--r--packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch19
-rw-r--r--packages/ixp4xx/ixp4xx-csr_2.1.bb3
2 files changed, 21 insertions, 1 deletions
diff --git a/packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch b/packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch
new file mode 100644
index 0000000000..c61fcc00d3
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-csr-2.1/module-param.patch
@@ -0,0 +1,19 @@
+ src/oslinux/IxLinuxInit.c | 4 ++++
+ 1 files changed, 4 insertions(+)
+
+Index: ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+===================================================================
+--- ixp400_xscale_sw.orig/src/oslinux/IxLinuxInit.c
++++ ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+@@ -93,7 +93,11 @@
+ /* Module parameters */
+ static int livelock_dispatcher = 0;/* default: don't use livelock dispatcher*/
+
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
+ MODULE_PARM(livelock_dispatcher, "i");
++#else
++module_param(livelock_dispatcher, int, 0644);
++#endif
+ MODULE_PARM_DESC(livelock_dispatcher, "If non-zero, use the livelock prevention qmgr dispatcher");
+
+ /* Init and cleanup functions for module */
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb
index d8fe3b21c7..3bc29b3286 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb
@@ -36,10 +36,11 @@ 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"
+SRC_URI += "file://module-param.patch;patch=1"
DEPENDS = "ixp-osal"
S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r11"
+PR = "r12"
COMPATIBLE_HOST = "^arm.*-linux.*"