Fix broken compilation when build against a 2.6.18 kernel (#148524)

Package-Manager: portage-2.1.1

3 files changed, 43 insertions, 3 deletions

diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 7bad7009fb3f..2de876d30ca3 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ltmodem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.27 2006/09/09 11:00:31 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.28 2006/09/21 19:07:35 mrness Exp $
+
+  21 Sep 2006; Alin Nastac <mrness@gentoo.org>
+  +files/ltmodem-2.6-alk-8-kernel-changes.patch,
+  -files/ltmodem-2.6-alk-8-module_param.patch,
+  ltmodem-8.31_alpha10-r3.ebuild:
+  Fix broken compilation when build against a 2.6.18 kernel (#148524).
 
 *ltmodem-8.31_alpha10-r3 (09 Sep 2006)
 
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6-alk-8-kernel-changes.patch b/net-dialup/ltmodem/files/ltmodem-2.6-alk-8-kernel-changes.patch
new file mode 100644
index 000000000000..a47ab90e8f8a
--- /dev/null
+++ b/net-dialup/ltmodem/files/ltmodem-2.6-alk-8-kernel-changes.patch
@@ -0,0 +1,34 @@
+diff -Nru ltmodem-2.6-alk-8.orig/lt_modem.c ltmodem-2.6-alk-8/lt_modem.c
+--- ltmodem-2.6-alk-8.orig/lt_modem.c	2005-12-12 03:18:55.000000000 +0200
++++ ltmodem-2.6-alk-8/lt_modem.c	2006-04-19 21:43:32.142640500 +0300
+@@ -120,14 +120,14 @@
+ static int vendor_id = 0;
+ static int device_id = 0;
+ 
+-MODULE_PARM(vendor_id, "i");
++module_param(vendor_id, int, 0);
+ MODULE_PARM_DESC(vendor_id, "Vendor ID of the Lucent Modem e.g. vendor_id=0x11c1");
+-MODULE_PARM(device_id, "i");
++module_param(device_id, int, 0);
+ MODULE_PARM_DESC(device_id, "Device ID of the Lucent Modem e.g. device_id=0x0440");
+ 
+ static int Forced[4] = {-1,-1,-1,0};
+ 
+-MODULE_PARM(Forced, "4i");
++module_param_array(Forced, int, NULL, 0);
+ MODULE_PARM_DESC(Forced, "Forced Irq,BaseAddress,ComAddress[,NoDetect] of the Lucent Modem e.g. Forced=3,0x130,0x2f8");
+ 
+ static
+diff -Nru ltmodem-2.6-alk-8.orig/serial.c ltmodem-2.6-alk-8/serial.c
+--- ltmodem-2.6-alk-8.orig/serial.c	2005-12-12 03:07:17.000000000 +0200
++++ ltmodem-2.6-alk-8/serial.c	2006-09-21 21:53:08.055717500 +0300
+@@ -732,7 +732,9 @@
+ 	.devfs_name		= "tts/LT",
+ 	.dev_name		= "ttyLT",
+ #else
++#	if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
+ 	.devfs_name		= "tts/LTM",
++#	endif
+ 	.dev_name		= "ttyLTM",
+ #endif
+ 	.major			= 62,
diff --git a/net-dialup/ltmodem/ltmodem-8.31_alpha10-r3.ebuild b/net-dialup/ltmodem/ltmodem-8.31_alpha10-r3.ebuild
index b12481531887..5142b1272666 100644
--- a/net-dialup/ltmodem/ltmodem-8.31_alpha10-r3.ebuild
+++ b/net-dialup/ltmodem/ltmodem-8.31_alpha10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha10-r3.ebuild,v 1.1 2006/09/09 11:00:31 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-8.31_alpha10-r3.ebuild,v 1.2 2006/09/21 19:07:35 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -48,7 +48,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}/ltmodem-2.6-alk-8-module_param.patch"
+	epatch "${FILESDIR}/${PN}-${MY_ALK_VER}-kernel-changes.patch"
 	convert_to_m "${S}/Makefile"
 }