This is a note to let you know that I've just added the patch titled
ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-mach-integrator-add-stub-for-pci_v3_early_init-for-config_pci.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 4dc3231f818baf7415c67ee06c51ace0973ae736 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joro@xxxxxxxxxx>
Date: Wed, 25 Sep 2013 12:11:33 +0200
Subject: ARM: mach-integrator: Add stub for pci_v3_early_init() for !CONFIG_PCI
From: Joerg Roedel <joro@xxxxxxxxxx>
commit 4dc3231f818baf7415c67ee06c51ace0973ae736 upstream.
This fixes a compile error where CONFIG_PCI is disabled:
LD init/built-in.o
arch/arm/mach-integrator/built-in.o: In function `ap_map_io':
integrator_cp.c:(.init.text+0x570): undefined reference to `pci_v3_early_init'
make[1]: *** [vmlinux] Error 1
make: *** [sub-make] Error 2
Signed-off-by: Joerg Roedel <joro@xxxxxxxxxx>
Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-integrator/pci_v3.h | 7 +++++++
1 file changed, 7 insertions(+)
--- a/arch/arm/mach-integrator/pci_v3.h
+++ b/arch/arm/mach-integrator/pci_v3.h
@@ -1,2 +1,9 @@
/* Simple oneliner include to the PCIv3 early init */
+#ifdef CONFIG_PCI
extern int pci_v3_early_init(void);
+#else
+static inline int pci_v3_early_init(void)
+{
+ return 0;
+}
+#endif
Patches currently in stable-queue which might be from joro@xxxxxxxxxx are
queue-3.11/arm-mach-integrator-add-stub-for-pci_v3_early_init-for-config_pci.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html