From: Bjorn Helgaas Even though the devices claimed by sony_acpi.c can not be hot-plugged, the driver registration infrastructure allows the .add() and .remove() methods to be called at any time while the driver is registered. So remove __init and __exit from them. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton --- drivers/acpi/sony_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/acpi/sony_acpi.c~acpi-remove-__init-__exit-from-sony-add-remove-methods drivers/acpi/sony_acpi.c --- devel/drivers/acpi/sony_acpi.c~acpi-remove-__init-__exit-from-sony-add-remove-methods 2006-05-27 23:28:03.000000000 -0700 +++ devel-akpm/drivers/acpi/sony_acpi.c 2006-05-27 23:28:03.000000000 -0700 @@ -258,7 +258,7 @@ static acpi_status sony_walk_callback(ac return AE_OK; } -static int __init sony_acpi_add(struct acpi_device *device) +static int sony_acpi_add(struct acpi_device *device) { acpi_status status; int result; @@ -340,7 +340,7 @@ outwalk: } -static int __exit sony_acpi_remove(struct acpi_device *device, int type) +static int sony_acpi_remove(struct acpi_device *device, int type) { acpi_status status; struct sony_acpi_value *item; _