redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'fluff' into release

Browse source
This commit is contained in:
Len Brown 2009-01-09 03:37:20 -05:00
parent b8ef914e58 8a383ef0be
commit 33a8c927e4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/ec.c
View file

@ -369,7 +369,7 @@ unlock:
* Note: samsung nv5000 doesn't work with ec burst mode. * Note: samsung nv5000 doesn't work with ec burst mode.
* http://bugzilla.kernel.org/show_bug.cgi?id=4980 * http://bugzilla.kernel.org/show_bug.cgi?id=4980
*/ */
int acpi_ec_burst_enable(struct acpi_ec *ec) static int acpi_ec_burst_enable(struct acpi_ec *ec)
{ {
u8 d; u8 d;
struct transaction t = {.command = ACPI_EC_BURST_ENABLE, struct transaction t = {.command = ACPI_EC_BURST_ENABLE,
@ -379,7 +379,7 @@ int acpi_ec_burst_enable(struct acpi_ec *ec)
return acpi_ec_transaction(ec, &t, 0); return acpi_ec_transaction(ec, &t, 0);
} }
int acpi_ec_burst_disable(struct acpi_ec *ec) static int acpi_ec_burst_disable(struct acpi_ec *ec)
{ {
struct transaction t = {.command = ACPI_EC_BURST_DISABLE, struct transaction t = {.command = ACPI_EC_BURST_DISABLE,
.wdata = NULL, .rdata = NULL, .wdata = NULL, .rdata = NULL,

2
drivers/acpi/pci_link.c
View file

@ -912,7 +912,7 @@ static int __init acpi_irq_nobalance_set(char *str)
__setup("acpi_irq_nobalance", acpi_irq_nobalance_set); __setup("acpi_irq_nobalance", acpi_irq_nobalance_set);
int __init acpi_irq_balance_set(char *str) static int __init acpi_irq_balance_set(char *str)
{ {
acpi_irq_balance = 1; acpi_irq_balance = 1;
return 1; return 1;

4
drivers/acpi/video_detect.c
View file

@ -234,7 +234,7 @@ EXPORT_SYMBOL(acpi_video_display_switch_support);
* To force that backlight or display output switching is processed by vendor * To force that backlight or display output switching is processed by vendor
* specific acpi drivers or video.ko driver. * specific acpi drivers or video.ko driver.
*/ */
int __init acpi_backlight(char *str) static int __init acpi_backlight(char *str)
{ {
if (str == NULL || *str == '\0') if (str == NULL || *str == '\0')
return 1; return 1;
@ -250,7 +250,7 @@ int __init acpi_backlight(char *str)
} }
__setup("acpi_backlight=", acpi_backlight); __setup("acpi_backlight=", acpi_backlight);
int __init acpi_display_output(char *str) static int __init acpi_display_output(char *str)
{ {
if (str == NULL || *str == '\0') if (str == NULL || *str == '\0')
return 1; return 1;