diff options
author | 2019-07-03 10:50:21 +0200 | |
---|---|---|
committer | 2019-07-03 10:50:21 +0200 | |
commit | 341924049558e5f7c1a148a2c461a417933d35d9 (patch) | |
tree | 1340b4f2131737ef4be63f18ee74cd73ad12cd3e /arch/arm/mach-ixp4xx/Kconfig | |
parent | hrtimer: Use a bullet for the returns bullet list (diff) | |
parent | MAINTAINERS: Fix Andy's surname and the directory entries of VDSO (diff) | |
download | linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.gz linux-341924049558e5f7c1a148a2c461a417933d35d9.tar.bz2 linux-341924049558e5f7c1a148a2c461a417933d35d9.zip |
Merge branch 'timers/vdso' into timers/core
so the hyper-v clocksource update can be applied.
Diffstat (limited to 'arch/arm/mach-ixp4xx/Kconfig')
-rw-r--r-- | arch/arm/mach-ixp4xx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index 2f052c56cd9e..fc5378b00f3d 100644 --- a/arch/arm/mach-ixp4xx/Kconfig +++ b/arch/arm/mach-ixp4xx/Kconfig @@ -13,7 +13,6 @@ config MACH_IXP4XX_OF select I2C select I2C_IOP3XX select PCI - select SERIAL_OF_PLATFORM select TIMER_OF select USE_OF help |