diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-03-05 00:51:35 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-05 00:52:16 +0300 |
| commit | 756c08b068712dec875614f27ccbc38fdeda4fe7 (patch) | |
| tree | 9e2753ba488b438272fd5b8f15ae5e6761ea1b33 /arch/arm/Kconfig.debug | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| parent | fd9454ab51fa92f43ae5b7a71c42f2ee8417c2a2 (diff) | |
| download | linux-756c08b068712dec875614f27ccbc38fdeda4fe7.tar.xz | |
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.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 970de7518341..1ca8dc75a745 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1573,7 +1573,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ - PLAT_SAMSUNG || ARCH_EFM32 + PLAT_SAMSUNG || ARCH_EFM32 || \ + ARCH_SHMOBILE_LEGACY default "mach/uncompress.h" config EARLY_PRINTK |