Merge branches 'release' and 'throttling-domains' into release

[linux-2.6-omap-h63xx.git] / drivers / misc / fujitsu-laptop.c

diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index d366a6cc1fd94807db5f6a50311324423d5fdf81..1cfd7f3f129400fd9d8d22d429689d6d29234d4a 100644 (file)
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -50,7 +50,6 @@
 #include <linux/dmi.h>
 #include <linux/backlight.h>
 #include <linux/platform_device.h>
-#include <linux/autoconf.h>
 
 #define FUJITSU_DRIVER_VERSION "0.3"
 
@@ -122,9 +121,6 @@ static int get_lcd_level(void)
        else
                fujitsu->brightness_changed = 0;
 
-       if (status < 0)
-               return status;
-
        return fujitsu->brightness_level;
 }
 
@@ -198,7 +194,7 @@ static struct platform_driver fujitsupf_driver = {
 
 /* ACPI device */
 
-int acpi_fujitsu_add(struct acpi_device *device)
+static int acpi_fujitsu_add(struct acpi_device *device)
 {
        int result = 0;
        int state = 0;
@@ -229,7 +225,7 @@ int acpi_fujitsu_add(struct acpi_device *device)
        return result;
 }
 
-int acpi_fujitsu_remove(struct acpi_device *device, int type)
+static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 {
        ACPI_FUNCTION_TRACE("acpi_fujitsu_remove");