summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-laptop')
-rw-r--r--app-laptop/ibm-acpi/ChangeLog6
-rw-r--r--app-laptop/ibm-acpi/files/ibm-acpi-0.11-device_add.patch21
-rw-r--r--app-laptop/ibm-acpi/ibm-acpi-0.11-r1.ebuild7
3 files changed, 31 insertions, 3 deletions
diff --git a/app-laptop/ibm-acpi/ChangeLog b/app-laptop/ibm-acpi/ChangeLog
index 5fc9c40a76fc..3d1654cb0a3f 100644
--- a/app-laptop/ibm-acpi/ChangeLog
+++ b/app-laptop/ibm-acpi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-laptop/ibm-acpi
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ChangeLog,v 1.27 2005/08/08 17:14:03 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ChangeLog,v 1.28 2005/08/29 16:12:07 brix Exp $
+
+ 29 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
+ +files/ibm-acpi-0.11-device_add.patch, ibm-acpi-0.11-r1.ebuild:
+ Fix compilation with linux-2.6.13.
08 Aug 2005; Henrik Brix Andersen <brix@gentoo.org>
ibm-acpi-0.11-r1.ebuild:
diff --git a/app-laptop/ibm-acpi/files/ibm-acpi-0.11-device_add.patch b/app-laptop/ibm-acpi/files/ibm-acpi-0.11-device_add.patch
new file mode 100644
index 000000000000..54089463a6e4
--- /dev/null
+++ b/app-laptop/ibm-acpi/files/ibm-acpi-0.11-device_add.patch
@@ -0,0 +1,21 @@
+diff -rup ibm-acpi-0.11/ibm_acpi.c ibm-acpi-0.11-device_add/ibm_acpi.c
+--- ibm-acpi-0.11/ibm_acpi.c 2005-03-17 11:06:16.000000000 +0100
++++ ibm-acpi-0.11-device_add/ibm_acpi.c 2005-08-29 18:08:11.000000000 +0200
+@@ -1752,7 +1752,7 @@ static int __init setup_notify(struct ib
+ return 0;
+ }
+
+-static int device_add(struct acpi_device *device)
++static int ibmacpi_device_add(struct acpi_device *device)
+ {
+ return 0;
+ }
+@@ -1770,7 +1770,7 @@ static int __init register_driver(struct
+ memset(ibm->driver, 0, sizeof(struct acpi_driver));
+ sprintf(ibm->driver->name, "%s/%s", IBM_NAME, ibm->name);
+ ibm->driver->ids = ibm->hid;
+- ibm->driver->ops.add = &device_add;
++ ibm->driver->ops.add = &ibmacpi_device_add;
+
+ ret = acpi_bus_register_driver(ibm->driver);
+ if (ret < 0) {
diff --git a/app-laptop/ibm-acpi/ibm-acpi-0.11-r1.ebuild b/app-laptop/ibm-acpi/ibm-acpi-0.11-r1.ebuild
index 70dd989579be..e3520fde6de8 100644
--- a/app-laptop/ibm-acpi/ibm-acpi-0.11-r1.ebuild
+++ b/app-laptop/ibm-acpi/ibm-acpi-0.11-r1.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/app-laptop/ibm-acpi/ibm-acpi-0.11-r1.ebuild,v 1.3 2005/08/08 17:14:03 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/ibm-acpi/ibm-acpi-0.11-r1.ebuild,v 1.4 2005/08/29 16:12:07 brix Exp $
-inherit linux-mod
+inherit eutils linux-mod
DESCRIPTION="IBM ThinkPad ACPI extras"
@@ -35,6 +35,9 @@ pkg_setup() {
src_unpack() {
unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-device_add.patch
+
convert_to_m ${S}/Makefile
}