Fix compilation errors when build against kernel 2.6.27, thanks to Aleksandar Topuzovic (#244833).

(Portage version: 2.1.4.4)

4 files changed, 48 insertions, 18 deletions

diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 3d638e71f79e..2ba9dc959088 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ltmodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.43 2008/08/31 16:59:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.44 2008/11/02 10:26:37 mrness Exp $
+
+  02 Nov 2008; Alin Năstac <mrness@gentoo.org>
+  -files/ltmodem-2.6.9-kernel-2.6.24.patch,
+  +files/ltmodem-2.6.9-kernel-2.6.27.patch, ltmodem-2.6.9-r1.ebuild:
+  Fix compilation errors when build against kernel 2.6.27, thanks to
+  Aleksandar Topuzovic (#244833).
 
   31 Aug 2008; Alin Năstac <mrness@gentoo.org> ltmodem-2.6.9-r1.ebuild:
   Add AgereSystems-WinModem license (#235484).
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
deleted file mode 100644
index b2d8f111a882..000000000000
--- a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.24.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru ltmodem-2.6-alk-9.orig/serial.c ltmodem-2.6-alk-9/serial.c
---- ltmodem-2.6-alk-9.orig/serial.c	2007-09-06 04:56:25.000000000 +0300
-+++ ltmodem-2.6-alk-9/serial.c	2008-02-13 17:21:44.000000000 +0200
-@@ -826,7 +826,11 @@
- 	*lt_modem_ops.virtual_isr_ptr = lt_virtual_rs_interrupt;
- 
- 	/* lets try to grap dsp interrupt here */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- 	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, SA_INTERRUPT | SA_SHIRQ,
-+#else
-+	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, IRQF_DISABLED | IRQF_SHARED,
-+#endif
- 				ltserialstring, &lt_modem_res.BaseAddress);
- 	if (ret<0)
- 		goto out_port;
diff --git a/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.27.patch b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.27.patch
new file mode 100644
index 000000000000..d9e5cd23e27a
--- /dev/null
+++ b/net-dialup/ltmodem/files/ltmodem-2.6.9-kernel-2.6.27.patch
@@ -0,0 +1,39 @@
+diff -Nru ltmodem-2.6-alk-9.orig/serial.c ltmodem-2.6-alk-9/serial.c
+--- ltmodem-2.6-alk-9.orig/serial.c	2007-09-06 01:56:25.000000000 +0000
++++ ltmodem-2.6-alk-9/serial.c	2008-11-02 10:19:26.000000000 +0000
+@@ -362,7 +362,11 @@
+ 		receive_chars(&lt_port,&status,0);
+ 
+ 		{
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ 			struct tty_struct *tty = lt_port.port.info->tty;
++#else
++			struct tty_struct *tty = lt_port.port.info->port.tty;
++#endif
+ 			spin_unlock_irqrestore(&lt_port.port.lock, flags);
+ 			tty_flip_buffer_push(tty);
+ 			spin_lock_irqsave(&lt_port.port.lock,flags);
+@@ -568,7 +572,11 @@
+ 
+ 	// force low latency mode on tty.
+ 	// We will push data from buttom half, no need to delay it further.
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ 	port->info->tty->low_latency = 1;
++#else
++	port->info->port.tty->low_latency = 1;
++#endif
+ 
+ 	lt_modem_ops.PortOpen();
+ 
+@@ -826,7 +834,11 @@
+ 	*lt_modem_ops.virtual_isr_ptr = lt_virtual_rs_interrupt;
+ 
+ 	/* lets try to grap dsp interrupt here */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+ 	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, SA_INTERRUPT | SA_SHIRQ,
++#else
++	ret = request_irq(lt_modem_res.Irq, VMODEM_Hw_Int_Proc, IRQF_DISABLED | IRQF_SHARED,
++#endif
+ 				ltserialstring, &lt_modem_res.BaseAddress);
+ 	if (ret<0)
+ 		goto out_port;
diff --git a/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild b/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild
index d7908526b8f8..6a067f55caf6 100644
--- a/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild
+++ b/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild,v 1.2 2008/08/31 16:59:16 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ltmodem-2.6.9-r1.ebuild,v 1.3 2008/11/02 10:26:37 mrness Exp $
 
 inherit linux-mod eutils
 
@@ -46,7 +46,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-kernel-2.6.24.patch
+	epatch "${FILESDIR}"/${P}-kernel-2.6.27.patch
 }
 
 src_install() {