Commit 044aff7a authored by Andy Grover's avatar Andy Grover Committed by Linus Torvalds

[PATCH] ACPI [2/3]

This update gets things compiling again after a device model change.
parent e32aa901
...@@ -92,7 +92,7 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = ...@@ -92,7 +92,7 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata =
#ifdef CONFIG_LDM #ifdef CONFIG_LDM
static int acpi_device_probe(struct device *dev); static int acpi_device_probe(struct device *dev);
static int acpi_device_remove(struct device *dev, u32 flags); static int acpi_device_remove(struct device *dev);
static int acpi_device_suspend(struct device *dev, u32 state, u32 stage); static int acpi_device_suspend(struct device *dev, u32 state, u32 stage);
static int acpi_device_resume(struct device *dev, u32 stage); static int acpi_device_resume(struct device *dev, u32 stage);
...@@ -121,8 +121,7 @@ acpi_device_probe ( ...@@ -121,8 +121,7 @@ acpi_device_probe (
static int static int
acpi_device_remove ( acpi_device_remove (
struct device *dev, struct device *dev)
u32 flags)
{ {
ACPI_FUNCTION_TRACE("acpi_device_remove"); ACPI_FUNCTION_TRACE("acpi_device_remove");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment