提交 33a8c927 编写于 作者: L Len Brown

Merge branch 'fluff' into release

......@@ -369,7 +369,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t,
* Note: samsung nv5000 doesn't work with ec burst mode.
* 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;
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);
}
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,
.wdata = NULL, .rdata = NULL,
......
......@@ -912,7 +912,7 @@ static int __init acpi_irq_nobalance_set(char *str)
__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;
return 1;
......
......@@ -234,7 +234,7 @@ EXPORT_SYMBOL(acpi_video_display_switch_support);
* To force that backlight or display output switching is processed by vendor
* 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')
return 1;
......@@ -250,7 +250,7 @@ int __init acpi_backlight(char *str)
}
__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')
return 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册