Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
arch/arm/mach-prima2/Kconfig between commit 9352b05b6e4e ("ARM: select
MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform") from the arm-soc
tree and commit b096b0b50c4b ("Kconfig: rename HAS_IOPORT to
HAS_IOPORT_MAP") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/mach-prima2/Kconfig
index 2c726b4f9356,850ff5500821..000000000000
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@@ -1,8 -1,10 +1,8 @@@
config ARCH_SIRF
bool "CSR SiRF" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
- select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP
- select NO_IOPORT
- select MIGHT_HAVE_CACHE_L2X0
+ select NO_IOPORT_MAP
select PINCTRL
select PINCTRL_SIRF
help
Attachment:
pgp1HwjqBQTB3.pgp
Description: PGP signature
