Pull fujitsu into release branch
This commit is contained in:
commit
b2451e4399
@ -122,9 +122,6 @@ static int get_lcd_level(void)
|
|||||||
else
|
else
|
||||||
fujitsu->brightness_changed = 0;
|
fujitsu->brightness_changed = 0;
|
||||||
|
|
||||||
if (status < 0)
|
|
||||||
return status;
|
|
||||||
|
|
||||||
return fujitsu->brightness_level;
|
return fujitsu->brightness_level;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -198,7 +195,7 @@ static struct platform_driver fujitsupf_driver = {
|
|||||||
|
|
||||||
/* ACPI device */
|
/* ACPI device */
|
||||||
|
|
||||||
int acpi_fujitsu_add(struct acpi_device *device)
|
static int acpi_fujitsu_add(struct acpi_device *device)
|
||||||
{
|
{
|
||||||
int result = 0;
|
int result = 0;
|
||||||
int state = 0;
|
int state = 0;
|
||||||
@ -229,7 +226,7 @@ int acpi_fujitsu_add(struct acpi_device *device)
|
|||||||
return result;
|
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");
|
ACPI_FUNCTION_TRACE("acpi_fujitsu_remove");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user