| 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
| ||
|
Date: Thu, 6 Sep 2012 15:42:40 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Roland Stigge <stigge@...com.de>, Greg KH <greg@...ah.com>
Subject: linux-next: manual merge of the arm-soc tree with the usb tree
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/usb/host/Kconfig between commit 952230d774bb ("usb: ohci: Fix
Kconfig dependency on USB_ISP1301") from the usb tree and commit
d684f05f2d55 ("ARM: mach-pnx4008: Remove architecture") from the arm-soc
tree.
I fixed it up (see below) and can carry the fix as necessary (no action
required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/usb/host/Kconfig
index 13cd6d5,276add2..0000000
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
depends on USB && USB_ARCH_HAS_OHCI
select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
select USB_OTG_UTILS if ARCH_OMAP
- depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
- select USB_ISP1301 if ARCH_LPC32XX
++ depends on USB_ISP1301 || !ARCH_LPC32XX
---help---
The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists