From: Len Brown <len.brown@intel.com>
Date: Fri, 16 Jun 2006 01:28:57 +0000 (-0400)
Subject: Pull acpi_bus_register_driver into release branch
X-Git-Tag: v2.6.18-rc1~1081^2~19^2~10
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cd291c6bbc6647fe3783257c5a2e076e808f71;p=linux-2.6

Pull acpi_bus_register_driver into release branch

Conflicts:

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

69cd291c6bbc6647fe3783257c5a2e076e808f71
diff --cc drivers/acpi/asus_acpi.c
index 1a545489e8,523fff9cf1..90eb3c5a15
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@@ -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;