diff options
| author | Olof Johansson | 2013-08-29 19:44:42 +0200 |
|---|---|---|
| committer | Olof Johansson | 2013-08-29 19:44:42 +0200 |
| commit | 293d0e3bf0818f3f7307a56d3ac31f41b5078aa1 (patch) | |
| tree | aab2e5026c66d52581c39b5c21aca6e3fd8d0357 /arch/arm/kernel/head-nommu.S | |
| parent | Merge tag 'tegra-for-3.12-defconfig' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | ARM: bcm: Make secure API call optional (diff) | |
| download | kernel-qcow2-linux-293d0e3bf0818f3f7307a56d3ac31f41b5078aa1.tar.gz kernel-qcow2-linux-293d0e3bf0818f3f7307a56d3ac31f41b5078aa1.tar.xz kernel-qcow2-linux-293d0e3bf0818f3f7307a56d3ac31f41b5078aa1.zip | |
Merge branch 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351 into next/boards
From Christian Daudt, SoC changes for Broadcom.
* 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351: (673 commits)
ARM: bcm: Make secure API call optional
ARM: DT: binding fixup to align with vendor-prefixes.txt (drivers)
ARM: mmc: fix NONREMOVABLE test in sdhci-bcm-kona
ARM: bcm: Rename board_bcm
mmc: sdhci-bcm-kona: make linker-section warning go away
ARM: configs: disable DEBUG_LL in bcm_defconfig
ARM: bcm281xx: Board specific reboot code
ARM bcm281xx: Turn on socket & network support.
ARM: bcm281xx: Turn on L2 cache.
+ Linux 3.11-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/kernel/head-nommu.S')
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index b361de143756..14235ba64a90 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -87,6 +87,7 @@ ENTRY(stext) ENDPROC(stext) #ifdef CONFIG_SMP + .text ENTRY(secondary_startup) /* * Common entry point for secondary CPUs. |