diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 22:51:35 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 22:52:16 +0100 |
| commit | 756c08b068712dec875614f27ccbc38fdeda4fe7 (patch) | |
| tree | 9e2753ba488b438272fd5b8f15ae5e6761ea1b33 /arch/arm/Kconfig | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| parent | fd9454ab51fa92f43ae5b7a71c42f2ee8417c2a2 (diff) | |
| download | op-kernel-dev-756c08b068712dec875614f27ccbc38fdeda4fe7.zip op-kernel-dev-756c08b068712dec875614f27ccbc38fdeda4fe7.tar.gz | |
Merge tag 'renesas-soc-cleanup-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform
Pull "Renesas ARM Based SoC Cleanup for v4.1" from Simon Horman:
* Remove redundant cpu_disable implementation from r8a7779 SoC
* Remove mach/{uncompress,clkdev,system}.h
* tag 'renesas-soc-cleanup-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Remove redundant cpu_disable implementation
ARM: shmobile: Remove mach/uncompress.h
ARM: shmobile: Remove mach/clkdev.h
ARM: shmobile: Remove mach/system.h
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f1f09a..495fb7a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -646,7 +646,6 @@ config ARCH_SHMOBILE_LEGACY select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_MACH_CLKDEV select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select MULTI_IRQ_HANDLER |
