diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 22:45:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 22:45:08 -0700 |
| commit | 8c5c25067044b7bcb2201e761483ef4cacc970d8 (patch) | |
| tree | 0b4a636b842430947c58ad3ef00303f511f2d809 /include/linux/soc | |
| parent | 43e68aa7b58f0f2d9abb79ca03c397f4f00d9238 (diff) | |
| parent | 8be381a131c29c4737aed44e7e5f90cb77bb4a7e (diff) | |
| download | linux-0-day-8c5c25067044b7bcb2201e761483ef4cacc970d8.tar.gz linux-0-day-8c5c25067044b7bcb2201e761483ef4cacc970d8.tar.xz | |
Merge tag 'renesas-drivers-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
Renesas ARM Based SoC Drivers Updates for v4.13
* Rework Kconfig and Makefile logic
* tag 'renesas-drivers-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
soc: renesas: Rework Kconfig and Makefile logic
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/soc')
| -rw-r--r-- | include/linux/soc/renesas/rcar-rst.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h index 787e7ad53d45f..2c231f2280a6d 100644 --- a/include/linux/soc/renesas/rcar-rst.h +++ b/include/linux/soc/renesas/rcar-rst.h @@ -1,8 +1,7 @@ #ifndef __LINUX_SOC_RENESAS_RCAR_RST_H__ #define __LINUX_SOC_RENESAS_RCAR_RST_H__ -#if defined(CONFIG_ARCH_RCAR_GEN1) || defined(CONFIG_ARCH_RCAR_GEN2) || \ - defined(CONFIG_ARCH_R8A7795) || defined(CONFIG_ARCH_R8A7796) +#ifdef CONFIG_RST_RCAR int rcar_rst_read_mode_pins(u32 *mode); #else static inline int rcar_rst_read_mode_pins(u32 *mode) { return -ENODEV; } |