diff options
author | Len Brown <len.brown@intel.com> | 2005-08-24 12:10:49 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-24 12:11:34 -0400 |
commit | 76f58584824c61eb5b3bdbf019236815921d2e7c (patch) | |
tree | a8cb03339eddd5ada3c9d04b70b8bd6520e2bc14 /drivers/acpi | |
parent | 8466361ad5233d4356a4601e16b66c25277920d1 (diff) |
[ACPI] delete CONFIG_ACPI_BUS
it is a synonym for CONFIG_ACPI
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/Kconfig | 4 | ||||
-rw-r--r-- | drivers/acpi/Makefile | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f023a88ca398..8cafa4adcf49 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -267,10 +267,6 @@ config ACPI_DEBUG | |||
267 | of verbosity. Saying Y enables these statements. This will increase | 267 | of verbosity. Saying Y enables these statements. This will increase |
268 | your kernel size by around 50K. | 268 | your kernel size by around 50K. |
269 | 269 | ||
270 | config ACPI_BUS | ||
271 | bool | ||
272 | default y | ||
273 | |||
274 | config ACPI_EC | 270 | config ACPI_EC |
275 | bool | 271 | bool |
276 | depends on X86 | 272 | depends on X86 |
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 060afaf962a3..b6a3c9192385 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
@@ -35,8 +35,8 @@ ifdef CONFIG_CPU_FREQ | |||
35 | processor-objs += processor_perflib.o | 35 | processor-objs += processor_perflib.o |
36 | endif | 36 | endif |
37 | 37 | ||
38 | obj-$(CONFIG_ACPI_BUS) += sleep/ | 38 | obj-y += sleep/ |
39 | obj-$(CONFIG_ACPI_BUS) += bus.o glue.o | 39 | obj-y += bus.o glue.o |
40 | obj-$(CONFIG_ACPI_AC) += ac.o | 40 | obj-$(CONFIG_ACPI_AC) += ac.o |
41 | obj-$(CONFIG_ACPI_BATTERY) += battery.o | 41 | obj-$(CONFIG_ACPI_BATTERY) += battery.o |
42 | obj-$(CONFIG_ACPI_BUTTON) += button.o | 42 | obj-$(CONFIG_ACPI_BUTTON) += button.o |
@@ -55,5 +55,5 @@ obj-$(CONFIG_ACPI_NUMA) += numa.o | |||
55 | obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o | 55 | obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o |
56 | obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o | 56 | obj-$(CONFIG_ACPI_IBM) += ibm_acpi.o |
57 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o | 57 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o |
58 | obj-$(CONFIG_ACPI_BUS) += scan.o motherboard.o | 58 | obj-y += scan.o motherboard.o |
59 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o | 59 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o |