diff options
| -rw-r--r-- | driver-core/bus_id-acpi.patch | 41 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 1 insertions, 43 deletions
diff --git a/driver-core/bus_id-acpi.patch b/driver-core/bus_id-acpi.patch deleted file mode 100644 index 3b5de6c09419df..00000000000000 --- a/driver-core/bus_id-acpi.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: acpi: struct device - replace bus_id with dev_name(), dev_set_name() - -Cc: lenb@kernel.org -Cc: linux-acpi@vger.kernel.org -Acked-by: Greg Kroah-Hartman <gregkh@suse.de> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> ---- - drivers/acpi/glue.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/acpi/glue.c -+++ b/drivers/acpi/glue.c -@@ -255,12 +255,12 @@ static int acpi_platform_notify(struct d - } - type = acpi_get_bus_type(dev->bus); - if (!type) { -- DBG("No ACPI bus support for %s\n", dev->bus_id); -+ DBG("No ACPI bus support for %s\n", dev_name(dev)); - ret = -EINVAL; - goto end; - } - if ((ret = type->find_device(dev, &handle)) != 0) -- DBG("Can't get handler for %s\n", dev->bus_id); -+ DBG("Can't get handler for %s\n", dev_name(dev)); - end: - if (!ret) - acpi_bind_one(dev, handle); -@@ -271,10 +271,10 @@ static int acpi_platform_notify(struct d - - acpi_get_name(dev->archdata.acpi_handle, - ACPI_FULL_PATHNAME, &buffer); -- DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer); -+ DBG("Device %s -> %s\n", dev_name(dev), (char *)buffer.pointer); - kfree(buffer.pointer); - } else -- DBG("Device %s -> No ACPI support\n", dev->bus_id); -+ DBG("Device %s -> No ACPI support\n", dev_name(dev)); - #endif - - return ret; @@ -66,7 +66,6 @@ driver-core/bus_id-rtc2.patch driver-core/bus_id-net2.patch driver-core/bus_id-drm.patch driver-core/bus_id-v4l.patch -driver-core/bus_id-acpi.patch driver-core/bus_id-amba.patch driver-core/bus_id-dio.patch driver-core/bus_id-dma.patch @@ -1 +1 @@ -2.6.29-rc3-git6 +2.6.29-rc3-git12 |