Merge ../linus

[linux-drm-fsl-dcu.git] / drivers / parport / Kconfig

diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index c7fa28a28b9f0b3dc31ec0f1afefc21c05654c22..36c6a1bfe558374dc76a9124375f0c06c92bfded 100644 (file)
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -82,9 +82,6 @@ config PARPORT_PC_PCMCIA
          Say Y here if you need PCMCIA support for your PC-style parallel
          ports. If unsure, say N.
 
-config PARPORT_NOT_PC
-       bool
-
 config PARPORT_IP32
        tristate "SGI IP32 builtin port (EXPERIMENTAL)"
        depends on SGI_IP32 && PARPORT && EXPERIMENTAL
@@ -158,5 +155,8 @@ config PARPORT_1284
          transfer modes. Also say Y if you want device ID information to
          appear in /proc/sys/dev/parport/*/autoprobe*. It is safe to say N.
 
+config PARPORT_NOT_PC
+       bool
+
 endmenu