diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 16:12:20 +0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 16:12:20 +0400 |
commit | 165415f700b0c77fa1f8db6198f48582639adf78 (patch) | |
tree | 088e305b0b5b0c6753072e13be1177824c3ed59d /drivers/pnp/Kconfig | |
parent | c324b44c34050cf2a9b58830e11c974806bd85d8 (diff) | |
parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
download | linux-165415f700b0c77fa1f8db6198f48582639adf78.tar.xz |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/pnp/Kconfig')
-rw-r--r-- | drivers/pnp/Kconfig | 2 |
1 files changed, 1 insertions, 1 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" config PNP bool "Plug and Play support" - depends on ISA || ACPI_BUS + depends on ISA || ACPI ---help--- Plug and Play (PnP) is a standard for peripherals which allows those peripherals to be configured by software, e.g. assign IRQ's or other |