Pull acpi_bus_register_driver into release branch
Len Brown [Fri, 16 Jun 2006 01:28:57 +0000 (21:28 -0400)]
Conflicts:

drivers/acpi/asus_acpi.c
drivers/acpi/scan.c

1  2 
drivers/acpi/asus_acpi.c
drivers/acpi/scan.c
drivers/char/sonypi.c
include/acpi/acpi_bus.h

@@@ -1119,7 -1119,9 +1119,9 @@@ static int asus_hotk_check(void
        return result;
  }
  
+ static int asus_hotk_found;
 -static int __init asus_hotk_add(struct acpi_device *device)
 +static int asus_hotk_add(struct acpi_device *device)
  {
        acpi_status status = AE_OK;
        int result;
Simple merge
Simple merge
Simple merge