Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6-omap-h63xx.git] / drivers / acpi / toshiba_acpi.c

diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c
index 3906d47b9783521683bcf001ad5ead9b29639c30..a736ef7bdee4726e3ef03c50b8fd1100c4b7b6ad 100644 (file)
--- a/drivers/acpi/toshiba_acpi.c
+++ b/drivers/acpi/toshiba_acpi.c
@@ -362,7 +362,7 @@ static unsigned long write_video(const char *buffer, unsigned long count)
        int crt_out = -1;
        int tv_out = -1;
        u32 hci_result;
-       int video_out;
+       u32 video_out;
 
        /* scan expression.  Multiple expressions may be delimited with ;
         *
@@ -524,7 +524,7 @@ static acpi_status __init add_device(void)
        return AE_OK;
 }
 
-static acpi_status __exit remove_device(void)
+static acpi_status remove_device(void)
 {
        ProcItem *item;
 
@@ -538,7 +538,7 @@ static struct backlight_ops toshiba_backlight_data = {
         .update_status  = set_lcd_status,
 };
 
-static void __exit toshiba_acpi_exit(void)
+static void toshiba_acpi_exit(void)
 {
        if (toshiba_backlight_device)
                backlight_device_unregister(toshiba_backlight_device);