From: Andrew Morton acpi_os_allocate() and acpi_os_free() got removed. Cc: Kristen Accardi Signed-off-by: Andrew Morton --- acpi/acpi_drivers.h | 0 drivers/acpi/scan.c | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/acpi/dock.c~acpi-dock-driver-interface-fixups drivers/acpi/dock.c diff -puN drivers/acpi/Kconfig~acpi-dock-driver-interface-fixups drivers/acpi/Kconfig diff -puN drivers/acpi/Makefile~acpi-dock-driver-interface-fixups drivers/acpi/Makefile diff -puN drivers/acpi/scan.c~acpi-dock-driver-interface-fixups drivers/acpi/scan.c --- devel/drivers/acpi/scan.c~acpi-dock-driver-interface-fixups 2006-05-17 13:09:08.000000000 -0700 +++ devel-akpm/drivers/acpi/scan.c 2006-05-17 13:09:08.000000000 -0700 @@ -670,7 +670,7 @@ acpi_bus_get_ejd(acpi_handle handle, acp if (ACPI_SUCCESS(status)) { obj = buffer.pointer; status = acpi_get_handle(NULL, obj->string.pointer, ejd); - acpi_os_free(buffer.pointer); + kfree(buffer.pointer); } return status; } diff -puN include/acpi/acpi_bus.h~acpi-dock-driver-interface-fixups include/acpi/acpi_bus.h diff -puN include/acpi/acpi_drivers.h~acpi-dock-driver-interface-fixups include/acpi/acpi_drivers.h _