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

Commit 95e3f66f authored by Len Brown's avatar Len Brown
Browse files

Pull misc into release branch

parents 5e41d0d6 66baf327

drivers/acpi/event.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int acpi_bus_generate_netlink_event(const char *device_class, 
	return 0;

}



EXPORT_SYMBOL(acpi_generate_netlink_event);

EXPORT_SYMBOL(acpi_bus_generate_netlink_event);



static int acpi_event_genetlink_init(void)

{

drivers/acpi/sleep/proc.c

+5 −5
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 */



ACPI_MODULE_NAME("sleep")

#ifdef	CONFIG_ACPI_PROCFS_SLEEP

#ifdef	CONFIG_ACPI_PROCFS

static int acpi_system_sleep_seq_show(struct seq_file *seq, void *offset)

{

	int i;
@@ -76,7 +76,7 @@ acpi_system_write_sleep(struct file *file, 
      Done:

	return error ? error : count;

}

#endif				/* CONFIG_ACPI_PROCFS_SLEEP */

#endif				/* CONFIG_ACPI_PROCFS */



#if defined(CONFIG_RTC_DRV_CMOS) || defined(CONFIG_RTC_DRV_CMOS_MODULE) || !defined(CONFIG_X86)

/* use /sys/class/rtc/rtcX/wakealarm instead; it's not ACPI-specific */
@@ -471,7 +471,7 @@ static const struct file_operations acpi_system_wakeup_device_fops = { 
	.release = single_release,

};



#ifdef	CONFIG_ACPI_PROCFS_SLEEP

#ifdef	CONFIG_ACPI_PROCFS

static const struct file_operations acpi_system_sleep_fops = {

	.open = acpi_system_sleep_open_fs,

	.read = seq_read,
@@ -479,7 +479,7 @@ static const struct file_operations acpi_system_sleep_fops = { 
	.llseek = seq_lseek,

	.release = single_release,

};

#endif				/* CONFIG_ACPI_PROCFS_SLEEP */

#endif				/* CONFIG_ACPI_PROCFS */



#ifdef	HAVE_ACPI_LEGACY_ALARM

static const struct file_operations acpi_system_alarm_fops = {
@@ -506,7 +506,7 @@ static int __init acpi_sleep_proc_init(void) 
	if (acpi_disabled)

		return 0;



#ifdef	CONFIG_ACPI_PROCFS_SLEEP

#ifdef	CONFIG_ACPI_PROCFS

	/* 'sleep' [R/W] */

	entry =

	    create_proc_entry("sleep", S_IFREG | S_IRUGO | S_IWUSR,

drivers/misc/msi-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int __init msi_init(void) 
	if (IS_ERR(msibl_device))

		return PTR_ERR(msibl_device);



	msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1,

	msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;



	ret = platform_driver_register(&msipf_driver);

	if (ret)