Subject: [PATCH] [acpi driver model] Shorten config option names - Trivial change, purely cosmetic. Signed-off-by: Patrick Mochel --- drivers/acpi/drivers/Kconfig | 7 +++---- drivers/acpi/drivers/Makefile | 2 +- drivers/acpi/drivers/core/Makefile | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) applies-to: d97699ea23fa4c6a46ecf9d35b8cedeee47cf0aa f9c4de8576fcae608e9012c5b7dd64ab786d0b51 diff --git a/drivers/acpi/drivers/Kconfig b/drivers/acpi/drivers/Kconfig index 5b95135..3b09067 100644 --- a/drivers/acpi/drivers/Kconfig +++ b/drivers/acpi/drivers/Kconfig @@ -2,7 +2,7 @@ menu "ACPI Driver Support" -config ACPI_DRIVER_MODEL +config ACPI_DM bool "Enable (New) ACPI Device Driver Support" default y ---help--- @@ -20,8 +20,9 @@ config ACPI_DRIVER_MODEL option enabled, so please say 'Y' here. -config ACPI_DRIVER_MODEL_DEBUG +config ACPI_DM_DEBUG bool "Enable debugging in ACPI Driver Model" + depends on ACPI_DM default n ---help--- @@ -32,7 +33,5 @@ config ACPI_DRIVER_MODEL_DEBUG You probably want to say 'N' here, unless you are developing an extension to the ACPI driver model core, or are debugging it for some reason. - - endmenu diff --git a/drivers/acpi/drivers/Makefile b/drivers/acpi/drivers/Makefile index 3ea55ef..80107bd 100644 --- a/drivers/acpi/drivers/Makefile +++ b/drivers/acpi/drivers/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_ACPI_DRIVER_MODEL) := core/ +obj-$(CONFIG_ACPI_DM) := core/ diff --git a/drivers/acpi/drivers/core/Makefile b/drivers/acpi/drivers/core/Makefile index 0695d46..bef21a0 100644 --- a/drivers/acpi/drivers/core/Makefile +++ b/drivers/acpi/drivers/core/Makefile @@ -3,7 +3,7 @@ obj-y := bus.o device.o driver.o obj-y += lib.o -ifeq ($(CONFIG_ACPI_DRIVER_MODEL_DEBUG),y) +ifeq ($(CONFIG_ACPI_DM_DEBUG),y) EXTRA_CFLAGS += -DDEBUG endif --- 0.99.9.GIT