summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown2007-10-29 22:30:48 +0100
committerLen Brown2007-10-29 22:30:48 +0100
commitb2451e4399d7233cd0008823872f51112d18f8d0 (patch)
tree2673680709e9fb19064fcc3f485ad88f75a4763d /drivers
parentPull alexey-fixes into release branch (diff)
parentfujitsu-laptop.c: remove dead code (diff)
downloadkernel-qcow2-linux-b2451e4399d7233cd0008823872f51112d18f8d0.tar.gz
kernel-qcow2-linux-b2451e4399d7233cd0008823872f51112d18f8d0.tar.xz
kernel-qcow2-linux-b2451e4399d7233cd0008823872f51112d18f8d0.zip
Pull fujitsu into release branch
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/fujitsu-laptop.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index d366a6cc1fd9..c8d62c268b11 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -122,9 +122,6 @@ static int get_lcd_level(void)
else
fujitsu->brightness_changed = 0;
- if (status < 0)
- return status;
-
return fujitsu->brightness_level;
}
@@ -198,7 +195,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 +226,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");