diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2006-12-20 18:33:11 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2006-12-20 18:33:11 +0000 |
| commit | cdb2761ff27f9b33c96bbea118f0173585997ef1 (patch) | |
| tree | 6da96e49cf0a390fe4f6cc7dc15d818b1f4411ef /net-dialup/slmodem | |
| parent | amd64 stable, bug 158656 (diff) | |
| download | gentoo-2-cdb2761ff27f9b33c96bbea118f0173585997ef1.tar.gz gentoo-2-cdb2761ff27f9b33c96bbea118f0173585997ef1.tar.bz2 gentoo-2-cdb2761ff27f9b33c96bbea118f0173585997ef1.zip | |
Make kernel patch future-proof (bug #156783 comment #11).
(Portage version: 2.1.1-r2)
Diffstat (limited to 'net-dialup/slmodem')
| -rw-r--r-- | net-dialup/slmodem/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch | 34 |
2 files changed, 27 insertions, 13 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog index 777f34fc3402..75af359d2554 100644 --- a/net-dialup/slmodem/ChangeLog +++ b/net-dialup/slmodem/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/slmodem # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.77 2006/12/08 11:42:19 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.78 2006/12/20 18:33:11 mrness Exp $ + + 20 Dec 2006; Alin Năstac <mrness@gentoo.org> + files/slmodem-2.9.11-kernel-2.6.19.patch: + Make kernel patch future-proof (bug #156783 comment #11). 08 Dec 2006; Christian Faulhammer <opfer@gentoo.org> slmodem-2.9.11_pre20061021-r1.ebuild: diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch index b9db2de709bc..2958470ae034 100644 --- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch +++ b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.19.patch @@ -1,24 +1,34 @@ -diff -Nru work.old/slmodem-2.9.11-20061021/drivers/amrmo_init.c work/slmodem-2.9.11-20061021/drivers/amrmo_init.c ---- work.old/slmodem-2.9.11-20061021/drivers/amrmo_init.c 2006-10-21 22:15:44.000000000 +0300 -+++ work/slmodem-2.9.11-20061021/drivers/amrmo_init.c 2006-12-02 10:16:22.778347895 +0200 -@@ -43,7 +43,7 @@ +diff -Nru work.orig/slmodem-2.9.11-20061021/drivers/amrmo_init.c work/slmodem-2.9.11-20061021/drivers/amrmo_init.c +--- work.orig/slmodem-2.9.11-20061021/drivers/amrmo_init.c 2006-12-20 20:26:38.000000000 +0200 ++++ work/slmodem-2.9.11-20061021/drivers/amrmo_init.c 2006-12-20 20:28:01.000000000 +0200 +@@ -43,9 +43,11 @@ /*****************************************************************************/ -#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/module.h> +-#include <linux/module.h> #include <linux/version.h> ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include <linux/config.h> ++#endif ++#include <linux/module.h> #include <linux/init.h> -diff -Nru work.old/ungrab-winmodem/ungrab-winmodem.c work/ungrab-winmodem/ungrab-winmodem.c ---- work.old/ungrab-winmodem/ungrab-winmodem.c 2005-09-06 16:29:11.000000000 +0300 -+++ work/ungrab-winmodem/ungrab-winmodem.c 2006-12-02 10:16:22.778347895 +0200 -@@ -11,7 +11,7 @@ + #include <linux/pci.h> + #include <linux/kernel.h> +diff -Nru work.orig/ungrab-winmodem/ungrab-winmodem.c work/ungrab-winmodem/ungrab-winmodem.c +--- work.orig/ungrab-winmodem/ungrab-winmodem.c 2006-12-20 20:26:38.000000000 +0200 ++++ work/ungrab-winmodem/ungrab-winmodem.c 2006-12-20 20:28:19.000000000 +0200 +@@ -11,9 +11,11 @@ * */ -#include <linux/config.h> -+#include <linux/autoconf.h> - #include <linux/module.h> +-#include <linux/module.h> #include <linux/version.h> ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++# include <linux/config.h> ++#endif ++#include <linux/module.h> #include <linux/init.h> + #include <linux/pci.h> + #include <linux/kernel.h> |