aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/ec.c4
-rw-r--r--drivers/acpi/pci_link.c2
-rw-r--r--drivers/acpi/video_detect.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 30f3ef236ecb..783acdae6af2 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -370,7 +370,7 @@ unlock:
370 * Note: samsung nv5000 doesn't work with ec burst mode. 370 * Note: samsung nv5000 doesn't work with ec burst mode.
371 * http://bugzilla.kernel.org/show_bug.cgi?id=4980 371 * http://bugzilla.kernel.org/show_bug.cgi?id=4980
372 */ 372 */
373int acpi_ec_burst_enable(struct acpi_ec *ec) 373static int acpi_ec_burst_enable(struct acpi_ec *ec)
374{ 374{
375 u8 d; 375 u8 d;
376 struct transaction t = {.command = ACPI_EC_BURST_ENABLE, 376 struct transaction t = {.command = ACPI_EC_BURST_ENABLE,
@@ -380,7 +380,7 @@ int acpi_ec_burst_enable(struct acpi_ec *ec)
380 return acpi_ec_transaction(ec, &t, 0); 380 return acpi_ec_transaction(ec, &t, 0);
381} 381}
382 382
383int acpi_ec_burst_disable(struct acpi_ec *ec) 383static int acpi_ec_burst_disable(struct acpi_ec *ec)
384{ 384{
385 struct transaction t = {.command = ACPI_EC_BURST_DISABLE, 385 struct transaction t = {.command = ACPI_EC_BURST_DISABLE,
386 .wdata = NULL, .rdata = NULL, 386 .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
915int __init acpi_irq_balance_set(char *str) 915static 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 */
237int __init acpi_backlight(char *str) 237static 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
253int __init acpi_display_output(char *str) 253static 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;