Commit c80dc60b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: ACPI_DOCK: Initialize the atomic notifier list
  ACPI: acpi_os_allocate() fixes
  ACPI: SBS: fix initialization, sem2mutex
  ACPI: add 'const' to several ACPI file_operations
  ACPI: delete some defaults from ACPI Kconfig
  ACPI: "Device `[%s]' is not power manageable" make message debug only
  ACPI: ACPI_DOCK Kconfig
  Revert "Revert "ACPI: dock driver""
  ACPI: acpi_os_get_thread_id() returns current
  ACPI: ACPICA 20060707
parents 90ca9a2f 04666849

drivers/acpi/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ config ACPI_FAN 
	  This driver adds support for ACPI fan devices, allowing user-mode 

	  applications to perform basic fan control (on, off, status).



config ACPI_DOCK

	tristate "Dock"

	depends on EXPERIMENTAL

	help

	  This driver adds support for ACPI controlled docking stations



config ACPI_PROCESSOR

	tristate "Processor"

	default y
@@ -206,6 +212,7 @@ config ACPI_IBM 
config ACPI_IBM_DOCK

	bool "Legacy Docking Station Support"

	depends on ACPI_IBM

	depends on ACPI_DOCK=n

	default n

	---help---

	  Allows the ibm_acpi driver to handle docking station events.

drivers/acpi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ obj-$(CONFIG_ACPI_BATTERY) += battery.o 
obj-$(CONFIG_ACPI_BUTTON)	+= button.o

obj-$(CONFIG_ACPI_EC)		+= ec.o

obj-$(CONFIG_ACPI_FAN)		+= fan.o

obj-$(CONFIG_ACPI_DOCK)		+= dock.o

obj-$(CONFIG_ACPI_VIDEO)	+= video.o 

obj-$(CONFIG_ACPI_HOTKEY)	+= hotkey.o

obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o

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;

	}

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE