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/scan.c

@@ -4,6 +4,7 @@
 
 #include <linux/init.h>
 #include <linux/acpi.h>
+#include <linux/module.h>
 
 #include <acpi/acpi_drivers.h>
 #include <acpi/acinterp.h>	/* for acpi_ex_eisa_id_to_string() */
@@ -18,6 +19,10 @@ extern struct acpi_device		*acpi_root;
 struct acpi_device 		*acpi_fixed_pwr_button;
 struct acpi_device 		*acpi_fixed_sleep_button;
 
+EXPORT_SYMBOL(acpi_fixed_pwr_button);
+EXPORT_SYMBOL(acpi_fixed_sleep_button);
+
+
 
 #define ACPI_BUS_CLASS			"system_bus"
 #define ACPI_BUS_HID			"ACPI_BUS"