Add patches accepted for 2.6.22-rc4
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.20-rc2 / 0003-ACPI-ibm-acpi-do-not-use-in-driver-names.txt
blob236713ee19b0b5ad4d76da41dc0bdc7752f97422
1 From 3dfd35cd214f7874c4917dfedff81f107d845c15 Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Fri, 24 Nov 2006 10:32:32 -0200
4 Subject: [PATCH 3/28] ACPI: ibm-acpi: do not use / in driver names
6 ibm-acpi uses sub-device names like ibm/hotkey, which get in the way of
7 a sysfs conversion.  Fix it to use ibm_hotkey instead.  Thanks to Zhang
8 Rui for noticing this.
10 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
11 ---
12  drivers/acpi/ibm_acpi.c |    2 +-
13  1 files changed, 1 insertions(+), 1 deletions(-)
15 diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
16 index cd8722e..ce69f75 100644
17 --- a/drivers/acpi/ibm_acpi.c
18 +++ b/drivers/acpi/ibm_acpi.c
19 @@ -1854,7 +1854,7 @@ static int __init register_driver(struct ibm_struct *ibm)
20         }
22         memset(ibm->driver, 0, sizeof(struct acpi_driver));
23 -       sprintf(ibm->driver->name, "%s/%s", IBM_NAME, ibm->name);
24 +       sprintf(ibm->driver->name, "%s_%s", IBM_NAME, ibm->name);
25         ibm->driver->ids = ibm->hid;
26         ibm->driver->ops.add = &ibm_device_add;
28 -- 
29 1.4.4.2