blob: 54089463a6e49d0cd26dc3a656a83449f6ce0a40 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
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) {
|
GitWeb
