summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2006-12-20 18:55:35 +0000
committerAlin Năstac <mrness@gentoo.org>2006-12-20 18:55:35 +0000
commit66ef93feecafefc7e32778a20b68638881530f60 (patch)
treef5b00158a18353bf99fe8feaec97ea8a0115218c
parentStable for HPPA (bug #156963). (diff)
downloadgentoo-2-66ef93feecafefc7e32778a20b68638881530f60.tar.gz
gentoo-2-66ef93feecafefc7e32778a20b68638881530f60.tar.bz2
gentoo-2-66ef93feecafefc7e32778a20b68638881530f60.zip
Make kernel patch future-proof (bug #156783 comment #11).
(Portage version: 2.1.1-r2)
-rw-r--r--net-dialup/ltmodem/ChangeLog6
-rw-r--r--net-dialup/ltmodem/files/ltmodem-2.6-alk-8-kernel-changes.patch10
2 files changed, 11 insertions, 5 deletions
diff --git a/net-dialup/ltmodem/ChangeLog b/net-dialup/ltmodem/ChangeLog
index 96cd7a9d2bb1..1a02cb4b0370 100644
--- a/net-dialup/ltmodem/ChangeLog
+++ b/net-dialup/ltmodem/ChangeLog
@@ -1,6 +1,10 @@
# 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.29 2006/12/03 07:56:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ltmodem/ChangeLog,v 1.30 2006/12/20 18:55:35 mrness Exp $
+
+ 20 Dec 2006; Alin Năstac <mrness@gentoo.org>
+ files/ltmodem-2.6-alk-8-kernel-changes.patch:
+ Make kernel patch future-proof (bug #156783 comment #11).
03 Dec 2006; Alin Năstac <mrness@gentoo.org>
files/ltmodem-2.6-alk-8-kernel-changes.patch:
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
index 1c5ee555d3e1..6df7d43fadd1 100644
--- 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
@@ -20,14 +20,16 @@ diff -Nru ltmodem-2.6-alk-8.orig/lt_modem.c ltmodem-2.6-alk-8/lt_modem.c
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
-@@ -99,7 +99,7 @@
+--- ltmodem-2.6-alk-8.orig/serial.c 2006-12-20 20:36:13.000000000 +0200
++++ ltmodem-2.6-alk-8/serial.c 2006-12-20 20:37:37.000000000 +0200
+@@ -99,7 +99,9 @@
*/
#include <linux/version.h>
-#include <linux/config.h>
-+#include <linux/autoconf.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
++# include <linux/config.h>
++#endif
#include <linux/module.h>
#include <linux/tty.h>
#include <linux/ioport.h>