Merge groveronline.com:/root/bk/linux-2.5

into groveronline.com:/root/bk/linux-acpi

drivers/acpi/ac.c

@@ -51,7 +51,7 @@ static struct acpi_driver acpi_ac_driver = {
 	.class =	ACPI_AC_CLASS,
 	.ids =		ACPI_AC_HID,
 	.ops =		{
-				.add =	acpi_ac_add,
+				.add =		acpi_ac_add,
 				.remove =	acpi_ac_remove,
 			},
 };

drivers/acpi/acpi_ksyms.c

@@ -114,6 +114,7 @@ EXPORT_SYMBOL(acpi_evaluate_reference);
 #ifdef CONFIG_ACPI_BUS
 
 EXPORT_SYMBOL(acpi_fadt);
+EXPORT_SYMBOL(acpi_walk_namespace);
 EXPORT_SYMBOL(acpi_root_dir);
 EXPORT_SYMBOL(acpi_bus_get_device);
 EXPORT_SYMBOL(acpi_bus_get_status);
@@ -127,4 +128,3 @@ EXPORT_SYMBOL(acpi_bus_scan);
 EXPORT_SYMBOL(acpi_init);
 
 #endif /*CONFIG_ACPI_BUS*/
-

drivers/acpi/battery.c

@@ -162,7 +162,7 @@ acpi_battery_get_info (
 	}
 
 end:
-	kfree(buffer.pointer);
+	acpi_os_free(buffer.pointer);
 
 	if (!result)
 		(*bif) = (struct acpi_battery_info *) data.pointer;
@@ -223,7 +223,7 @@ acpi_battery_get_status (
 	}
 
 end:
-	kfree(buffer.pointer);
+	acpi_os_free(buffer.pointer);
 
 	if (!result)
 		(*bst) = (struct acpi_battery_status *) data.pointer;

drivers/acpi/button.c

@@ -70,7 +70,6 @@ struct acpi_button {
 
 static struct proc_dir_entry	*acpi_button_dir = NULL;
 
-
 static int
 acpi_button_read_info (
 	char			*page,

drivers/acpi/pci_irq.c

@@ -288,7 +288,7 @@ acpi_pci_irq_derive (
 	while (!irq && (bridge = bridge->bus->self)) {
 		pin = (pin + PCI_SLOT(bridge->devfn)) % 4;
 		irq = acpi_pci_irq_lookup(0, bridge->bus->number, PCI_SLOT(bridge->devfn), pin);
-	};
+	}
 
 	if (!irq) {
 		ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Unable to derive IRQ for device %s\n", dev->slot_name));

drivers/acpi/pci_link.c

@@ -54,12 +54,12 @@ static int acpi_pci_link_add (struct acpi_device *device);
 static int acpi_pci_link_remove (struct acpi_device *device, int type);
 
 static struct acpi_driver acpi_pci_link_driver = {
-        .name =		ACPI_PCI_LINK_DRIVER_NAME,
-        .class =	ACPI_PCI_LINK_CLASS,
-        .ids =		ACPI_PCI_LINK_HID,
-        .ops =		{
-				.add =		acpi_pci_link_add,
-				.remove =	acpi_pci_link_remove,
+	.name =		ACPI_PCI_LINK_DRIVER_NAME,
+	.class =	ACPI_PCI_LINK_CLASS,
+	.ids =		ACPI_PCI_LINK_HID,
+	.ops =		{
+				.add =    acpi_pci_link_add,
+				.remove = acpi_pci_link_remove,
 			},
 };
 

drivers/acpi/pci_root.c

@@ -51,8 +51,8 @@ static struct acpi_driver acpi_pci_root_driver = {
 	.class =	ACPI_PCI_ROOT_CLASS,
 	.ids =		ACPI_PCI_ROOT_HID,
 	.ops =		{
-				.add =		acpi_pci_root_add,
-				.remove =	acpi_pci_root_remove,
+				.add =    acpi_pci_root_add,
+				.remove = acpi_pci_root_remove,
 			},
 };
 

drivers/acpi/system.c

@@ -23,8 +23,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
-#define ACPI_C
-
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

include/linux/acpi.h

@@ -354,11 +354,11 @@ void acpi_numa_arch_fixup(void);
 
 extern int acpi_mp_config;
 
-#else /*!CONFIG_ACPI_BOOT*/
+#else
 
 #define acpi_mp_config	0
 
-#endif /*CONFIG_ACPI_BOOT*/
+#endif
 
 
 #ifdef CONFIG_ACPI_PCI