diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 20:44:52 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 20:44:52 +0400 |
| commit | e87d10b29f459e23964b14fe2300f808c5b6282e (patch) | |
| tree | 50f3f9dc4edf56c04057bc22942dc906ee7a381a /arch/arm/mach-shmobile/include/mach | |
| parent | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (diff) | |
| parent | bfe4cfa8ae21628267f2b879b4396ee17ea4fd3a (diff) | |
| download | linux-e87d10b29f459e23964b14fe2300f808c5b6282e.tar.xz | |
Merge tag 'renesas-soc2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Second Round of Renesas ARM Based SoC Updates for v3.17" from Simon
Horman:
* Suspend on non-SMP update for r8a7790
* Move r8a7791.h out of mach directory.
This is part of a multi-stage effort to move headers
out of that directory.
* tag 'renesas-soc2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Allow r8a7791 to build non-SMP APMU code
ARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c
ARM: shmobile: Allow r8a7790 to build non-SMP APMU code
ARM: shmobile: Move r8a7790 reset code to pm-r8a7790.c
ARM: shmobile: Use __init for APMU suspend init function
ARM: shmobile: Adjust APMU code to build for non-SMP
ARM: shmobile: Allow use of boot code for non-SMP case
ARM: shmobile: Move r8a7791.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/r8a7791.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/include/mach/r8a7791.h deleted file mode 100644 index 86eae7bceb6f..000000000000 --- a/arch/arm/mach-shmobile/include/mach/r8a7791.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __ASM_R8A7791_H__ -#define __ASM_R8A7791_H__ - -void r8a7791_add_standard_devices(void); -void r8a7791_add_dt_devices(void); -void r8a7791_clock_init(void); -void r8a7791_pinmux_init(void); -void r8a7791_pm_init(void); -extern struct smp_operations r8a7791_smp_ops; - -#endif /* __ASM_R8A7791_H__ */ |