diff options
author | Olof Johansson <olof@lixom.net> | 2014-01-02 10:57:05 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-02 10:57:05 -0800 |
commit | c7fed591a6d5ce080482e4237bd02c99857c0d4f (patch) | |
tree | f697a76b366a228e21c222061bcef7000b973949 /arch/arm/boot/compressed/Makefile | |
parent | efcf3d38f128cfbfc7a62c3a5dc3fb42991c12e5 (diff) | |
parent | 20bdcab8268cb05702e12ae9013be96ecc7ec3a6 (diff) | |
download | blackbird-op-linux-c7fed591a6d5ce080482e4237bd02c99857c0d4f.tar.gz blackbird-op-linux-c7fed591a6d5ce080482e4237bd02c99857c0d4f.zip |
Merge tag 'renesas-sh-sci3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
From Simon Horman:
Third Round of Renesas SH SCI Updates for v3.14
* Add Device Tree Support
* Remove platform data mapbase and irqs fields
* Remove platform data scbrr_algo_id field
* tag 'renesas-sh-sci3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
serial: sh-sci: Add OF support
serial: sh-sci: Add device tree bindings documentation
serial: sh-sci: Remove platform data mapbase and irqs fields
serial: sh-sci: Remove platform data scbrr_algo_id field
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
-rw-r--r-- | arch/arm/boot/compressed/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index e7190bb5998e..f54d5a25c7ee 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -64,7 +64,7 @@ else endif endif -ifeq ($(CONFIG_ARCH_SHMOBILE),y) +ifeq ($(CONFIG_ARCH_SHMOBILE_LEGACY),y) OBJS += head-shmobile.o endif |