Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in
arch/arm/Kconfig between commit f3372c01816e ("ARM: gemini: convert to
GENERIC_CLOCKEVENTS") from the arm-soc tree and f5caa3b59e18 ("ARM:
deprecate mach/timex.h for !ARCH_MULTIPLATFORM") from the cortex tree and
commits ffde39ea61ea ("ARM: mmp: delete the custom GPIO header"),
88f718e3fa4d ("ARM: pxa: delete the custom GPIO header") and 85649711a895
("ARM: gemini: delete <mach/gpio.h>") from the gpio tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc arch/arm/Kconfig index 568d6471dd18,c6debe07f036..000000000000 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -397,10 -386,8 +397,9 @@@ config ARCH_CLPS711 config ARCH_GEMINI bool "Cortina Systems Gemini" select ARCH_REQUIRE_GPIOLIB - select ARCH_USES_GETTIMEOFFSET + select CLKSRC_MMIO select CPU_FA526 + select GENERIC_CLOCKEVENTS - select NEED_MACH_GPIO_H help Support for the Cortina Systems Gemini family SoCs @@@ -593,8 -558,6 +592,7 @@@ config ARCH_MM select GPIO_PXA select IRQ_DOMAIN select MULTI_IRQ_HANDLER - select NEED_MACH_GPIO_H + select NEED_MACH_TIMEX_H select PINCTRL select PLAT_PXA select SPARSE_IRQ @@@ -658,8 -620,6 +656,7 @@@ config ARCH_PX select GPIO_PXA select HAVE_IDE select MULTI_IRQ_HANDLER - select NEED_MACH_GPIO_H + select NEED_MACH_TIMEX_H select PLAT_PXA select SPARSE_IRQ help
pgpAkIBGQt_OR.pgp
Description: PGP signature
