diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 22:37:32 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-02-26 22:37:32 +0100 |
| commit | b8d56b61af3863276be43e7fbb8b374e96b50005 (patch) | |
| tree | 68f8092b4f9ba5e81b1c65dd24f58b1d3aabfd67 /arch/arm/mach-shmobile/headsmp-scu.S | |
| parent | 797bc813983c4299e6ddf17ec2ddf2e79f9259d7 (diff) | |
| parent | cf77db5165b606fca7d1d59735528ee43202392e (diff) | |
Merge tag 'renesas-cleanup2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Merge "Second Round of Renesas ARM Based SoC Cleanup for v4.6" from Simon Horman:
* Remove stale comment from Kconfig
* Consolidate SCU mapping code
* tag 'renesas-cleanup2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Kconfig: Get rid of old comment
ARM: shmobile: Consolidate SCU mapping code
Diffstat (limited to 'arch/arm/mach-shmobile/headsmp-scu.S')
| -rw-r--r-- | arch/arm/mach-shmobile/headsmp-scu.S | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index c0008a5aa4ca..936d7011c314 100644 --- a/arch/arm/mach-shmobile/headsmp-scu.S +++ b/arch/arm/mach-shmobile/headsmp-scu.S @@ -38,9 +38,3 @@ ENTRY(shmobile_boot_scu) b secondary_startup ENDPROC(shmobile_boot_scu) - - .text - .align 2 - .globl shmobile_scu_base -shmobile_scu_base: - .space 4 |