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

Commit 888ba6c6 authored Aug 24, 2005 by Len Brown

[ACPI] delete CONFIG_ACPI_BOOT



it has been a synonym for CONFIG_ACPI since 2.6.12

Signed-off-by: Len Brown <len.brown@intel.com>

parent 84ffa747

arch/i386/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -1203,7 +1203,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"

arch/i386/defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +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

arch/i386/kernel/Makefile

+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

arch/i386/kernel/acpi/Makefile

+1 −1

Original line number	Diff line number	Diff line
		obj-$(CONFIG_ACPI_BOOT) := boot.o
		obj-y := boot.o
		obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o
		obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o

arch/i386/kernel/io_apic.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2421,7 +2421,7 @@ device_initcall(ioapic_init_sysfs);
		ACPI-based IOAPIC Configuration
		-------------------------------------------------------------------------- */

		#ifdef CONFIG_ACPI_BOOT
		#ifdef CONFIG_ACPI

		int __init io_apic_get_unique_id (int ioapic, int apic_id)
		{
		@@ -2574,4 +2574,4 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
		return 0;
		}

		#endif /CONFIG_ACPI_BOOT/
		#endif /* CONFIG_ACPI */