diff options
author | Len Brown <len.brown@intel.com> | 2005-08-25 18:45:49 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-25 18:45:49 +0200 |
commit | 09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0 (patch) | |
tree | 29e6a11bffc92f6b8393344cab209e1f2b8bf7a9 /drivers/parport | |
parent | [IA64] fix allnoconfig build (diff) | |
parent | [PATCH] cfq-iosched.c: minor fixes (diff) | |
download | linux-09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0.tar.xz linux-09d4a80e66cdf3e68cdb06e907f7bc0b242acbd0.zip |
Merge HEAD from ../from-linus
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 16a2e6ae37f4..725a14119f2a 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 |