Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33a8c927 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'fluff' into release

parents b8ef914e 8a383ef0

drivers/acpi/ec.c

+2 −2
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ unlock: 
 * 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,

drivers/acpi/pci_link.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/acpi/video_detect.c

+2 −2
Original line number Diff line number Diff line
@@ -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;