diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 19:57:05 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 19:57:05 +0100 |
| commit | c7fed591a6d5ce080482e4237bd02c99857c0d4f (patch) | |
| tree | f697a76b366a228e21c222061bcef7000b973949 /arch/arm/Makefile | |
| parent | Merge tag 'renesas-sh-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | serial: sh-sci: Add OF support (diff) | |
| download | linux-c7fed591a6d5ce080482e4237bd02c99857c0d4f.tar.xz 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/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2cb05d4e4230..aa791d17179b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -190,7 +190,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100 machine-$(CONFIG_ARCH_S5PV210) += s5pv210 machine-$(CONFIG_ARCH_SA1100) += sa1100 machine-$(CONFIG_ARCH_SHMOBILE) += shmobile -machine-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile machine-$(CONFIG_ARCH_SIRF) += prima2 machine-$(CONFIG_ARCH_SOCFPGA) += socfpga machine-$(CONFIG_ARCH_STI) += sti |