aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/Kconfig
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-27 14:30:07 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-27 14:30:07 +0200
commitefda9452046bdd707b23a85b7846ec33548f84f1 (patch)
treef08c915049ea1829ba115cd41a0ba28ddf184e07 /drivers/parport/Kconfig
parentb01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff)
parent36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff)
downloadkernel_samsung_aries-efda9452046bdd707b23a85b7846ec33548f84f1.zip
kernel_samsung_aries-efda9452046bdd707b23a85b7846ec33548f84f1.tar.gz
kernel_samsung_aries-efda9452046bdd707b23a85b7846ec33548f84f1.tar.bz2
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/parport/Kconfig')
-rw-r--r--drivers/parport/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 16a2e6a..725a141 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -34,7 +34,7 @@ config PARPORT
config PARPORT_PC
tristate "PC-style hardware"
- depends on PARPORT && (!SPARC64 || PCI) && !SPARC32
+ depends on PARPORT && (!SPARC64 || PCI) && !SPARC32 && !M32R
---help---
You should say Y here if you have a PC-style parallel port. All
IBM PC compatible computers and some Alphas have PC-style