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

Commit f79e3185 authored by Len Brown's avatar Len Brown
Browse files

Pull misc into release branch

Conflicts:

	Documentation/feature-removal-schedule.txt
parents e8b495fe 8b8eb7d8
Loading
Loading
Loading
Loading
+4 −17
Original line number Diff line number Diff line
@@ -180,24 +180,11 @@ Who: Adrian Bunk <bunk@stusta.de>

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

What:	/sys/firmware/acpi/namespace
When:	2.6.21
Why:	The ACPI namespace is effectively the symbol list for
	the BIOS.  The device names are completely arbitrary
	and have no place being exposed to user-space.

	For those interested in the BIOS ACPI namespace,
	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.
When:	July 2008
Why:	ACPI sysfs conversion should be finished by January 2008.
	ACPI procfs interface will be removed in July 2008 so that
	there is enough time for the user space to catch up.
Who:	Zhang Rui <rui.zhang@intel.com>

---------------------------
+0 −8
Original line number Diff line number Diff line
@@ -984,14 +984,6 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
		     DMI_MATCH(DMI_PRODUCT_NAME, "PRIMERGY T850"),
		     },
	 },
	{
	 .callback = force_acpi_ht,
	 .ident = "DELL GX240",
	 .matches = {
		     DMI_MATCH(DMI_BOARD_VENDOR, "Dell Computer Corporation"),
		     DMI_MATCH(DMI_BOARD_NAME, "OptiPlex GX240"),
		     },
	 },
	{
	 .callback = force_acpi_ht,
	 .ident = "HP VISUALIZE NT Workstation",
+2 −11
Original line number Diff line number Diff line
@@ -2,16 +2,12 @@
# ACPI Configuration
#

menu "ACPI (Advanced Configuration and Power Interface) Support"
menuconfig ACPI
	bool "ACPI Support (Advanced Configuration and Power Interface) Support"
	depends on !X86_NUMAQ
	depends on !X86_VISWS
	depends on !IA64_HP_SIM
	depends on IA64 || X86
	depends on PM

config ACPI
	bool "ACPI Support"
	depends on IA64 || X86
	depends on PCI
	depends on PM
	select PNP
@@ -49,7 +45,6 @@ if ACPI
config ACPI_SLEEP
	bool "Sleep States"
	depends on X86 && (!SMP || SUSPEND_SMP)
	depends on PM
	default y
	---help---
	  This option adds support for ACPI suspend states. 
@@ -82,7 +77,6 @@ config ACPI_SLEEP_PROC_SLEEP

config ACPI_PROCFS
	bool "Procfs interface (deprecated)"
	depends on ACPI
	default y
	---help---
	  The Procfs interface for ACPI is made optional for backward compatibility.
@@ -338,7 +332,6 @@ config ACPI_CONTAINER

config ACPI_HOTPLUG_MEMORY
	tristate "Memory Hotplug"
	depends on ACPI
	depends on MEMORY_HOTPLUG
	default n
	help
@@ -367,5 +360,3 @@ config ACPI_SBS
	  to today's ACPI "Control Method" battery.

endif	# ACPI

endmenu
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
#if ACPI_GLUE_DEBUG
#define DBG(x...) printk(PREFIX x)
#else
#define DBG(x...)
#define DBG(x...) do { } while(0)
#endif
static LIST_HEAD(bus_type_list);
static DECLARE_RWSEM(bus_type_sem);
+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int acpi_pci_link_add(struct acpi_device *device)
	/* query and set link->irq.active */
	acpi_pci_link_get_current(link);

	printk(PREFIX "%s [%s] (IRQs", acpi_device_name(device),
	printk(KERN_INFO PREFIX "%s [%s] (IRQs", acpi_device_name(device),
	       acpi_device_bid(device));
	for (i = 0; i < link->irq.possible_count; i++) {
		if (link->irq.active == link->irq.possible[i]) {
Loading