diff options
author | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:20 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:37:20 -0500 |
commit | 33a8c927e423a205bcbbecdc43b451bad781a08e (patch) | |
tree | 4ed692143eec382ba87872cc48e7162e06bd7465 /drivers/acpi | |
parent | b8ef914e58e90c3b4dba5f5bdd8ab04c45d3e008 (diff) | |
parent | 8a383ef0be01e0e6e84c85f8bf35e4e6fcfb8981 (diff) |
Merge branch 'fluff' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/ec.c | 4 | ||||
-rw-r--r-- | drivers/acpi/pci_link.c | 2 | ||||
-rw-r--r-- | drivers/acpi/video_detect.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 2e8317bf723e..8dfcbb8aff73 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -369,7 +369,7 @@ unlock: | |||
369 | * Note: samsung nv5000 doesn't work with ec burst mode. | 369 | * Note: samsung nv5000 doesn't work with ec burst mode. |
370 | * http://bugzilla.kernel.org/show_bug.cgi?id=4980 | 370 | * http://bugzilla.kernel.org/show_bug.cgi?id=4980 |
371 | */ | 371 | */ |
372 | int acpi_ec_burst_enable(struct acpi_ec *ec) | 372 | static int acpi_ec_burst_enable(struct acpi_ec *ec) |
373 | { | 373 | { |
374 | u8 d; | 374 | u8 d; |
375 | struct transaction t = {.command = ACPI_EC_BURST_ENABLE, | 375 | struct transaction t = {.command = ACPI_EC_BURST_ENABLE, |
@@ -379,7 +379,7 @@ int acpi_ec_burst_enable(struct acpi_ec *ec) | |||
379 | return acpi_ec_transaction(ec, &t, 0); | 379 | return acpi_ec_transaction(ec, &t, 0); |
380 | } | 380 | } |
381 | 381 | ||
382 | int acpi_ec_burst_disable(struct acpi_ec *ec) | 382 | static int acpi_ec_burst_disable(struct acpi_ec *ec) |
383 | { | 383 | { |
384 | struct transaction t = {.command = ACPI_EC_BURST_DISABLE, | 384 | struct transaction t = {.command = ACPI_EC_BURST_DISABLE, |
385 | .wdata = NULL, .rdata = NULL, | 385 | .wdata = NULL, .rdata = NULL, |
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index e52ad91ce2dc..4869fa1b7892 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -912,7 +912,7 @@ static int __init acpi_irq_nobalance_set(char *str) | |||
912 | 912 | ||
913 | __setup("acpi_irq_nobalance", acpi_irq_nobalance_set); | 913 | __setup("acpi_irq_nobalance", acpi_irq_nobalance_set); |
914 | 914 | ||
915 | int __init acpi_irq_balance_set(char *str) | 915 | static int __init acpi_irq_balance_set(char *str) |
916 | { | 916 | { |
917 | acpi_irq_balance = 1; | 917 | acpi_irq_balance = 1; |
918 | return 1; | 918 | return 1; |
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index f022eb6f5637..50e3d2dbf3af 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c | |||
@@ -234,7 +234,7 @@ EXPORT_SYMBOL(acpi_video_display_switch_support); | |||
234 | * To force that backlight or display output switching is processed by vendor | 234 | * To force that backlight or display output switching is processed by vendor |
235 | * specific acpi drivers or video.ko driver. | 235 | * specific acpi drivers or video.ko driver. |
236 | */ | 236 | */ |
237 | int __init acpi_backlight(char *str) | 237 | static int __init acpi_backlight(char *str) |
238 | { | 238 | { |
239 | if (str == NULL || *str == '\0') | 239 | if (str == NULL || *str == '\0') |
240 | return 1; | 240 | return 1; |
@@ -250,7 +250,7 @@ int __init acpi_backlight(char *str) | |||
250 | } | 250 | } |
251 | __setup("acpi_backlight=", acpi_backlight); | 251 | __setup("acpi_backlight=", acpi_backlight); |
252 | 252 | ||
253 | int __init acpi_display_output(char *str) | 253 | static int __init acpi_display_output(char *str) |
254 | { | 254 | { |
255 | if (str == NULL || *str == '\0') | 255 | if (str == NULL || *str == '\0') |
256 | return 1; | 256 | return 1; |