Commit 975a8e3e authored by Len Brown's avatar Len Brown
Browse files

Pull sysfs into test branch 



Conflicts:

	Documentation/feature-removal-schedule.txt
	include/acpi/acpi_drivers.h

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 1fcb71b8 bfd80223

Documentation/feature-removal-schedule.txt

+9 −1
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ Who: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> 


---------------------------



<<<<<<< test:Documentation/feature-removal-schedule.txt

What:	ACPI hotkey driver (CONFIG_ACPI_HOTKEY)

When:	2.6.21

Why:	hotkey.c was an attempt to consolidate multiple drivers that use
@@ -306,11 +307,18 @@ Why: The ACPI namespace is effectively the symbol list for 
	the BIOS can be extracted and disassembled with acpidump

	and iasl as documented in the pmtools package here:

	http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils



Who:	Len Brown <len.brown@intel.com>



---------------------------



What:	ACPI procfs interface

When:	July 2007

Why:	After ACPI sysfs conversion, ACPI attributes will be duplicated

	in sysfs and the ACPI procfs interface should be removed.

Who:	Zhang Rui <rui.zhang@intel.com>



---------------------------



What:	/proc/acpi/button

When:	August 2007

Why:	/proc/acpi/button has been replaced by events to the input layer

drivers/acpi/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -77,6 +77,20 @@ config ACPI_SLEEP_PROC_SLEEP 
	  Create /proc/acpi/sleep

	  Deprecated by /sys/power/state



config ACPI_PROCFS

	bool "Procfs interface (deprecated)"

	depends on ACPI

	default y

	---help---

	  Procfs interface for ACPI is made optional for back-compatible.

	  As the same functions are duplicated in sysfs interface

	  and this proc interface will be removed some time later,

	  it's marked as deprecated.

	  ( /proc/acpi/debug_layer && debug_level are deprecated by

	    /sys/module/acpi/parameters/debug_layer && debug_level.

	    /proc/acpi/info is deprecated by

	    /sys/module/acpi/parameters/acpica_version )



config ACPI_AC

	tristate "AC Adapter"

	depends on X86

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ endif 


obj-y				+= sleep/

obj-y				+= bus.o glue.o

obj-y				+= scan.o motherboard.o

obj-$(CONFIG_ACPI_AC) 		+= ac.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_BUTTON)	+= button.o
@@ -57,7 +58,6 @@ obj-$(CONFIG_ACPI_NUMA) += numa.o 
obj-$(CONFIG_ACPI_ASUS)		+= asus_acpi.o

obj-$(CONFIG_ACPI_IBM)		+= ibm_acpi.o

obj-$(CONFIG_ACPI_TOSHIBA)	+= toshiba_acpi.o

obj-y				+= scan.o motherboard.o

obj-$(CONFIG_ACPI_HOTPLUG_MEMORY)	+= acpi_memhotplug.o

obj-y				+= cm_sbs.o

obj-$(CONFIG_ACPI_SBS)		+= i2c_ec.o sbs.o

drivers/acpi/battery.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); 


static int acpi_battery_add(struct acpi_device *device);

static int acpi_battery_remove(struct acpi_device *device, int type);

static int acpi_battery_resume(struct acpi_device *device, int status);

static int acpi_battery_resume(struct acpi_device *device);



static struct acpi_driver acpi_battery_driver = {

	.name = ACPI_BATTERY_DRIVER_NAME,
@@ -753,7 +753,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
}



/* this is needed to learn about changes made in suspended state */

static int acpi_battery_resume(struct acpi_device *device, int state)

static int acpi_battery_resume(struct acpi_device *device)

{

	struct acpi_battery *battery;

drivers/acpi/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int acpi_bus_set_power(acpi_handle handle, int state) 


	if (!device->flags.power_manageable) {

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

				device->kobj.name));

				device->dev.kobj.name));

		return -ENODEV;

	}

	/*