Guenter Roeck 94468783cd usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register ... Commit 3fa4d734 (usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv) changed the conditional around the declaration of usb_nop_xceiv_register from #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) to #if IS_ENABLED(CONFIG_NOP_USB_XCEIV) While that looks the same, it is semantically different. The first expression is true if CONFIG_NOP_USB_XCEIV is built as module and if the including code is built as module. The second expression is true if code depending on CONFIG_NOP_USB_XCEIV if built as module or into the kernel. As a result, the arm:allmodconfig build fails with arch/arm/mach-omap2/built-in.o: In function `omap3_evm_init': arch/arm/mach-omap2/board-omap3evm.c:703: undefined reference to `usb_nop_xceiv_register' Fix the problem by reverting to the old conditional. Cc: Josh Boyer <jwboyer@redhat.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-10-17 09:34:30 -07:00
..
acpi	Merge branch 'acpi-hotplug'	2013-08-30 14:14:25 +02:00
asm-generic	mm: Fix generic hugetlb pte check return type.	2013-10-02 20:02:35 -04:00
clocksource	ARM: SoC cleanups for 3.12	2013-09-06 13:21:16 -07:00
crypto
drm	Revert "drm: mark context support as a legacy subsystem"	2013-09-20 08:32:59 +10:00
dt-bindings	Device tree core updates for v3.12	2013-09-10 13:53:52 -07:00
keys
kvm	ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256	2013-08-30 16:12:39 +03:00
linux	usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register	2013-10-17 09:34:30 -07:00
math-emu
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
memory
misc
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2013-10-01 12:39:35 -04:00
pcmcia
ras
rdma	Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next	2013-09-03 09:01:08 -07:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-09-12 16:11:45 -07:00
sound	sound fixes for 3.12-rc1	2013-09-12 08:52:41 -07:00
target	target/iscsi: Bump versions to v4.1.0	2013-09-10 20:23:37 -07:00
trace	Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block	2013-09-22 15:00:11 -07:00
uapi	Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux	2013-09-29 10:02:40 -07:00
video	fbdev changes for 3.12:	2013-09-05 09:49:32 -07:00
xen	Features:	2013-09-04 17:45:39 -07:00
Kbuild