Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.5

into intel.com:/home/lenb/src/linux-acpi-test-2.6.6

drivers/acpi/button.c

@@ -108,8 +108,8 @@ static struct file_operations acpi_button_state_fops = {
    -------------------------------------------------------------------------- */
 
 static struct proc_dir_entry	*acpi_button_dir;
-struct acpi_device 	*fixed_pwr_button;
-struct acpi_device	*fixed_sleep_button;
+extern struct acpi_device 	*acpi_fixed_pwr_button;
+extern struct acpi_device	*acpi_fixed_sleep_button;
 
 
 static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
@@ -530,11 +530,11 @@ acpi_button_exit (void)
 {
 	ACPI_FUNCTION_TRACE("acpi_button_exit");
 
-	if(fixed_pwr_button) 
-		acpi_button_remove(fixed_pwr_button, ACPI_BUS_TYPE_POWER_BUTTON);
+	if(acpi_fixed_pwr_button) 
+		acpi_button_remove(acpi_fixed_pwr_button, ACPI_BUS_TYPE_POWER_BUTTON);
 
-	if(fixed_sleep_button)
-		acpi_button_remove(fixed_sleep_button, ACPI_BUS_TYPE_SLEEP_BUTTON);
+	if(acpi_fixed_sleep_button)
+		acpi_button_remove(acpi_fixed_sleep_button, ACPI_BUS_TYPE_SLEEP_BUTTON);
 
 	acpi_bus_unregister_driver(&acpi_button_driver);
 

drivers/acpi/scan.c

@@ -15,8 +15,8 @@ ACPI_MODULE_NAME		("scan")
 #define STRUCT_TO_INT(s)	(*((int*)&s))
 
 extern struct acpi_device		*acpi_root;
-extern struct acpi_device 		*fixed_pwr_button;
-extern struct acpi_device 		*fixed_sleep_button;
+struct acpi_device 		*acpi_fixed_pwr_button;
+struct acpi_device 		*acpi_fixed_sleep_button;
 
 
 #define ACPI_BUS_CLASS			"system_bus"
@@ -902,12 +902,11 @@ acpi_bus_scan_fixed (
 	struct acpi_device	*root)
 {
 	int			result = 0;
-	struct acpi_device	*device = NULL;
 
 	ACPI_FUNCTION_TRACE("acpi_bus_scan_fixed");
 
-	fixed_pwr_button = NULL;
-	fixed_sleep_button = NULL;
+	acpi_fixed_pwr_button = NULL;
+	acpi_fixed_sleep_button = NULL;
 
 
 	if (!root)
@@ -917,11 +916,11 @@ acpi_bus_scan_fixed (
 	 * Enumerate all fixed-feature devices.
 	 */
 	if (acpi_fadt.pwr_button == 0)
-		result = acpi_bus_add(&fixed_pwr_button, acpi_root, 
+		result = acpi_bus_add(&acpi_fixed_pwr_button, acpi_root, 
 			NULL, ACPI_BUS_TYPE_POWER_BUTTON);
 
 	if (acpi_fadt.sleep_button == 0)
-		result = acpi_bus_add(&fixed_sleep_button, acpi_root, 
+		result = acpi_bus_add(&acpi_fixed_sleep_button, acpi_root, 
 			NULL, ACPI_BUS_TYPE_SLEEP_BUTTON);
 
 	return_VALUE(result);