summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2005-03-15 17:15:27 +0000
committerAlin Năstac <mrness@gentoo.org>2005-03-15 17:15:27 +0000
commit77e9fa8010ee6c7648486b3cf8de85fbfb3eb422 (patch)
tree174bb2cbb20b3c385d941693db890e10251d112a /net-dialup
parentMissing dep (diff)
downloadgentoo-2-77e9fa8010ee6c7648486b3cf8de85fbfb3eb422.tar.gz
gentoo-2-77e9fa8010ee6c7648486b3cf8de85fbfb3eb422.tar.bz2
gentoo-2-77e9fa8010ee6c7648486b3cf8de85fbfb3eb422.zip
adapt to power management changes in kernel 2.6.11
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-dialup')
-rw-r--r--net-dialup/intel-536ep/ChangeLog7
-rw-r--r--net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch23
-rw-r--r--net-dialup/intel-536ep/intel-536ep-4.69.ebuild10
3 files changed, 36 insertions, 4 deletions
diff --git a/net-dialup/intel-536ep/ChangeLog b/net-dialup/intel-536ep/ChangeLog
index d4fa4821400b..300b46084f4d 100644
--- a/net-dialup/intel-536ep/ChangeLog
+++ b/net-dialup/intel-536ep/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/intel-536ep
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/ChangeLog,v 1.2 2005/02/09 22:31:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/ChangeLog,v 1.3 2005/03/15 17:15:27 mrness Exp $
+
+ 15 Mar 2005; Alin Nastac <mrness@gentoo.org>
+ +files/intel-536ep-4.69-kernel-2.6.11-pm.patch, intel-536ep-4.69.ebuild:
+ Fix broken compilation on systems with kernel ver >= 2.6.11 (#85212), thanks
+ to Markus Gothe <margo284@student.liu.se>.
10 Feb 2005; Alin Nastac <mrness@gentoo.org> intel-536ep-4.69.ebuild:
Fix broken compilation when installed on a machine with a 2.4 kernel (#81120).
diff --git a/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch b/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch
new file mode 100644
index 000000000000..45007ac35489
--- /dev/null
+++ b/net-dialup/intel-536ep/files/intel-536ep-4.69-kernel-2.6.11-pm.patch
@@ -0,0 +1,23 @@
+diff -Nur intel-536EP-2.56.76.0.orig/coredrv/coredrv.c intel-536EP-2.56.76.0/coredrv/coredrv.c
+--- intel-536EP-2.56.76.0.orig/coredrv/coredrv.c 2004-07-09 17:34:29.000000000 +0300
++++ intel-536EP-2.56.76.0/coredrv/coredrv.c 2005-03-15 18:58:22.804796760 +0200
+@@ -292,9 +292,6 @@
+ case PM_RESUME:
+ open();
+ break;
+- case PM_SAVE_STATE:
+- printk(KERN_WARNING"Saving power state is not implemented\n");
+- break;
+ default:
+ printk(KERN_WARNING"Unknown power mode request to 537 modem driver\n");
+ }
+@@ -859,9 +856,6 @@
+
+ asmlinkage void kScheduleDPC(void)
+ {
+-#ifdef CONFIG_PM
+- pm_access(power_dev);
+-#endif
+ #if defined(TARGET_CATAWBA)
+ dpc_function( 0 );
+ #else
diff --git a/net-dialup/intel-536ep/intel-536ep-4.69.ebuild b/net-dialup/intel-536ep/intel-536ep-4.69.ebuild
index 00fe98bc32e7..eafc52b12e71 100644
--- a/net-dialup/intel-536ep/intel-536ep-4.69.ebuild
+++ b/net-dialup/intel-536ep/intel-536ep-4.69.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/intel-536ep-4.69.ebuild,v 1.2 2005/02/09 22:31:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/intel-536ep/intel-536ep-4.69.ebuild,v 1.3 2005/03/15 17:15:27 mrness Exp $
-inherit flag-o-matic linux-mod
+inherit eutils flag-o-matic linux-mod
DESCRIPTION="Driver for Intel 536EP modem"
HOMEPAGE="http://developer.intel.com/design/modems/products/536ep.htm"
@@ -30,9 +30,13 @@ pkg_setup() {
src_unpack(){
unpack ${A}
+ cd ${S}
if kernel_is 2 4; then
#there is no way of passing this as make parameter
- sed -i -e 's/\$(PSTN_DEF)/-DTARGET_SELAH -DTARGET_LINUX -DLINUX/' ${S}/coredrv/Makefile
+ sed -i -e 's/\$(PSTN_DEF)/-DTARGET_SELAH -DTARGET_LINUX -DLINUX/' coredrv/Makefile
+ elif kernel_is ge 2 6 11; then
+ #addapt to power management changes occured in kernel
+ epatch ${FILESDIR}/${P}-kernel-2.6.11-pm.patch
fi
}