Commit:     5c493f5c9017b38a60ed2989af00e5faaa801815
Parent:     9f5096c56afe6f7602cce852b99b32a90804935d
Author:     Jan Engelhardt <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 15 23:39:38 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Jul 16 09:05:40 2007 -0700

    Use menuconfig objects: PNP
    Use menuconfigs instead of menus, so the whole menu can be disabled at once
    instead of going through all options.
    Signed-off-by: Jan Engelhardt <[EMAIL PROTECTED]>
    Cc: Adam Belay <[EMAIL PROTECTED]>
    Cc: Bjorn Helgaas <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/pnp/Kconfig         |   13 +++++--------
 drivers/pnp/isapnp/Kconfig  |    2 +-
 drivers/pnp/pnpbios/Kconfig |    2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
index 1959cef..821933f 100644
--- a/drivers/pnp/Kconfig
+++ b/drivers/pnp/Kconfig
@@ -2,11 +2,9 @@
 # Plug and Play configuration
-menu "Plug and Play support"
-       depends on HAS_IOMEM
-config PNP
+menuconfig PNP
        bool "Plug and Play support"
+       depends on HAS_IOMEM
        depends on ISA || ACPI
          Plug and Play (PnP) is a standard for peripherals which allows those
@@ -22,15 +20,15 @@ config PNP
          If unsure, say Y.
+if PNP
 config PNP_DEBUG
        bool "PnP Debug Messages"
-       depends on PNP
          Say Y if you want the Plug and Play Layer to print debug messages.
          This is useful if you are developing a PnP driver or troubleshooting.
 comment "Protocols"
-       depends on PNP
 source "drivers/pnp/isapnp/Kconfig"
@@ -38,5 +36,4 @@ source "drivers/pnp/pnpbios/Kconfig"
 source "drivers/pnp/pnpacpi/Kconfig"
+endif # PNP
diff --git a/drivers/pnp/isapnp/Kconfig b/drivers/pnp/isapnp/Kconfig
index 578651e..f1ef366 100644
--- a/drivers/pnp/isapnp/Kconfig
+++ b/drivers/pnp/isapnp/Kconfig
@@ -3,7 +3,7 @@
 config ISAPNP
        bool "ISA Plug and Play support"
-       depends on PNP && ISA
+       depends on ISA
          Say Y here if you would like support for ISA Plug and Play devices.
          Some information is in <file:Documentation/isapnp.txt>.
diff --git a/drivers/pnp/pnpbios/Kconfig b/drivers/pnp/pnpbios/Kconfig
index fab848c..b986d9f 100644
--- a/drivers/pnp/pnpbios/Kconfig
+++ b/drivers/pnp/pnpbios/Kconfig
@@ -3,7 +3,7 @@
 config PNPBIOS
        bool "Plug and Play BIOS support (EXPERIMENTAL)"
-       depends on PNP && ISA && X86 && EXPERIMENTAL
+       depends on ISA && X86 && EXPERIMENTAL
        default n
          Linux uses the PNPBIOS as defined in "Plug and Play BIOS
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to