Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6] / drivers / pnp / Kconfig

diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 6776308a1fe5a80b7ee6d6a7c0985e8ae496fc9d..c5143201419aebdeff65e7a2ad3e121e6bbd503f 100644 (file)
--- 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