| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1382706224-8859-2-git-send-email-treding@nvidia.com> Date: Fri, 25 Oct 2013 15:03:40 +0200 From: Thierry Reding <thierry.reding@...il.com> To: Guenter Roeck <linux@...ck-us.net>, Mark Salter <msalter@...hat.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: linux-next: manual merge of the h8300-remove tree Today's linux-next tree of the h8300-remove tree got a conflict in drivers/parport/Kconfig caused by commits e9783b0 (Revert "drivers: parport: Kconfig: exclude h8300 for PARPORT_PC") and d90c3eb (Kconfig cleanup (PARPORT_PC dependencies)). I fixed it up (see below). Please verify that the resolution looks good. Thanks, Thierry --- diff --cc drivers/parport/Kconfig index f536685,dc82ef0..2225237 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@@ -41,8 -35,10 +41,7 @@@ if PARPOR config PARPORT_PC tristate "PC-style hardware" - depends on (!SPARC64 || PCI) && !SPARC32 && !M32R && !FRV && !S390 && \ - (!M68K || ISA) && !MN10300 && !AVR32 && !BLACKFIN && \ - !XTENSA && !CRIS - + depends on ARCH_MIGHT_HAVE_PC_PARPORT - ---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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists