* linux-next: manual merge of the arm-soc tree with the gen-gpio tree
@ 2013-04-19 6:29 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-04-19 6:29 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Alexandre Courbot, Thomas Petazzoni,
Jason Cooper
[-- Attachment #1: Type: text/plain, Size: 950 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-orion/Makefile between commit 43b426d6fae8 ("arm:
plat-orion: use GPIO driver on CONFIG_GPIOLIB") from the gen-gpio tree
and various commits from the arm-soc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-orion/Makefile
index bbc0d6b,2eca54b..0000000
--- a/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@@ -3,8 -3,6 +3,6 @@@
#
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
- obj-y += addr-map.o
-
-orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o
+orion-gpio-$(CONFIG_GPIOLIB) += gpio.o
obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o
obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-19 6:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-19 6:29 linux-next: manual merge of the arm-soc tree with the gen-gpio tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).