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

Commit 1a39ed58 authored by Len Brown's avatar Len Brown
Browse files

Pull trivial into test branch

parents 1b045e5d d7508032

drivers/acpi/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ config ACPI_BUTTON 
config ACPI_VIDEO

	tristate "Video"

	depends on X86

	default y

	help

	  This driver implement the ACPI Extensions For Display Adapters

	  for integrated graphics devices on motherboard, as specified in
@@ -350,7 +349,6 @@ config ACPI_SBS 
	tristate "Smart Battery System (EXPERIMENTAL)"

	depends on X86 && I2C

	depends on EXPERIMENTAL

	default y

	help

	  This driver adds support for the Smart Battery System.

	  Depends on I2C (Device Drivers ---> I2C support)

drivers/acpi/ac.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ struct acpi_ac { 
	unsigned long state;

};



static struct file_operations acpi_ac_fops = {

static const struct file_operations acpi_ac_fops = {

	.open = acpi_ac_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,

drivers/acpi/battery.c

+3 −3
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int acpi_battery_alarm_open_fs(struct inode *inode, struct file *file) 
	return single_open(file, acpi_battery_read_alarm, PDE(inode)->data);

}



static struct file_operations acpi_battery_info_ops = {

static const struct file_operations acpi_battery_info_ops = {

	.open = acpi_battery_info_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,
@@ -565,7 +565,7 @@ static struct file_operations acpi_battery_info_ops = { 
	.owner = THIS_MODULE,

};



static struct file_operations acpi_battery_state_ops = {

static const struct file_operations acpi_battery_state_ops = {

	.open = acpi_battery_state_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,
@@ -573,7 +573,7 @@ static struct file_operations acpi_battery_state_ops = { 
	.owner = THIS_MODULE,

};



static struct file_operations acpi_battery_alarm_ops = {

static const struct file_operations acpi_battery_alarm_ops = {

	.open = acpi_battery_alarm_open_fs,

	.read = seq_read,

	.write = acpi_battery_write_alarm,

drivers/acpi/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -192,8 +192,8 @@ int acpi_bus_set_power(acpi_handle handle, int state) 
	/* Make sure this is a valid target state */



	if (!device->flags.power_manageable) {

		printk(KERN_DEBUG "Device `[%s]' is not power manageable",

				device->kobj.name);

		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device `[%s]' is not power manageable",

				device->kobj.name));

		return -ENODEV;

	}

	/*

drivers/acpi/button.c

+2 −2
Original line number Diff line number Diff line
@@ -87,14 +87,14 @@ struct acpi_button { 
	unsigned long pushed;

};



static struct file_operations acpi_button_info_fops = {

static const struct file_operations acpi_button_info_fops = {

	.open = acpi_button_info_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};



static struct file_operations acpi_button_state_fops = {

static const struct file_operations acpi_button_state_fops = {

	.open = acpi_button_state_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,