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/pnp | |
| 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/pnp')
| -rw-r--r-- | drivers/pnp/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/pnp/pnpacpi/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig index 6776308a1fe5..c5143201419a 100644 --- a/drivers/pnp/Kconfig +++ b/drivers/pnp/Kconfig | |||
| @@ -6,7 +6,7 @@ menu "Plug and Play support" | |||
| 6 | 6 | ||
| 7 | config PNP | 7 | config PNP |
| 8 | bool "Plug and Play support" | 8 | bool "Plug and Play support" |
| 9 | depends on ISA || ACPI_BUS | 9 | depends on ISA || ACPI |
| 10 | ---help--- | 10 | ---help--- |
| 11 | Plug and Play (PnP) is a standard for peripherals which allows those | 11 | Plug and Play (PnP) is a standard for peripherals which allows those |
| 12 | peripherals to be configured by software, e.g. assign IRQ's or other | 12 | peripherals to be configured by software, e.g. assign IRQ's or other |
diff --git a/drivers/pnp/pnpacpi/Kconfig b/drivers/pnp/pnpacpi/Kconfig index 0782cdc5009f..b1854171b963 100644 --- a/drivers/pnp/pnpacpi/Kconfig +++ b/drivers/pnp/pnpacpi/Kconfig | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | config PNPACPI | 4 | config PNPACPI |
| 5 | bool "Plug and Play ACPI support (EXPERIMENTAL)" | 5 | bool "Plug and Play ACPI support (EXPERIMENTAL)" |
| 6 | depends on PNP && ACPI_BUS && EXPERIMENTAL | 6 | depends on PNP && ACPI && EXPERIMENTAL |
| 7 | default y | 7 | default y |
| 8 | ---help--- | 8 | ---help--- |
| 9 | Linux uses the PNPACPI to autodetect built-in | 9 | Linux uses the PNPACPI to autodetect built-in |