Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wirel...

[sfrench/cifs-2.6.git] / drivers / pnp / pnpacpi / Kconfig

diff --git a/drivers/pnp/pnpacpi/Kconfig b/drivers/pnp/pnpacpi/Kconfig
index b1854171b9632b8ef260cf34ab6f0d0641a0f487..ad27e5e0101fd178bc9dbeeb84a94e855f0fc89e 100644 (file)
--- a/drivers/pnp/pnpacpi/Kconfig
+++ b/drivers/pnp/pnpacpi/Kconfig
@@ -2,8 +2,8 @@
 # Plug and Play ACPI configuration
 #
 config PNPACPI
-       bool "Plug and Play ACPI support (EXPERIMENTAL)"
-       depends on PNP && ACPI && EXPERIMENTAL
+       bool "Plug and Play ACPI support"
+       depends on PNP && ACPI
        default y
        ---help---
          Linux uses the PNPACPI to autodetect built-in