Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (6a4b170c) · Commits · git / linux-net

Documentation/acpi-hotkey.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,4 +35,4 @@ created. Please use command "cat /proc/acpi/hotkey/polling_method"
		to retrieve it.

		Note: Use cmdline "acpi_generic_hotkey" to over-ride
		loading any platform specific drivers.
		platform-specific with generic driver.

+283 −93

File changed.

Preview size limit exceeded, changes collapsed.

+0 −1

Original line number	Diff line number	Diff line
		@@ -1212,7 +1212,6 @@ config PCI_DIRECT
		config PCI_MMCONFIG
		bool
		depends on PCI && ACPI && (PCI_GOMMCONFIG \|\| PCI_GOANY)
		select ACPI_BOOT
		default y

		source "drivers/pci/pcie/Kconfig"

+0 −4

Original line number	Diff line number	Diff line
		@@ -131,8 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y
		# ACPI (Advanced Configuration and Power Interface) Support
		#
		CONFIG_ACPI=y
		CONFIG_ACPI_BOOT=y
		CONFIG_ACPI_INTERPRETER=y
		CONFIG_ACPI_SLEEP=y
		CONFIG_ACPI_SLEEP_PROC_FS=y
		CONFIG_ACPI_AC=y
		@@ -144,10 +142,8 @@ CONFIG_ACPI_THERMAL=y
		# CONFIG_ACPI_ASUS is not set
		# CONFIG_ACPI_TOSHIBA is not set
		# CONFIG_ACPI_DEBUG is not set
		CONFIG_ACPI_BUS=y
		CONFIG_ACPI_EC=y
		CONFIG_ACPI_POWER=y
		CONFIG_ACPI_PCI=y
		CONFIG_ACPI_SYSTEM=y
		# CONFIG_X86_PM_TIMER is not set

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \

		obj-y += cpu/
		obj-y += timers/
		obj-$(CONFIG_ACPI_BOOT) += acpi/
		obj-$(CONFIG_ACPI) += acpi/
		obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o
		obj-$(CONFIG_MCA) += mca.o
		obj-$(CONFIG_X86_MSR) += msr.o