diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-24 05:42:34 -0400 |
| commit | 43cbd286fbba4bfb0c2ef05dc62522dfd5a2c000 (patch) | |
| tree | 7184a24f04c72987e725e50e66db530e6f618220 /arch/arm/kernel/head.S | |
| parent | fee4b700a4e9e446151eb5a03874ca8666323113 (diff) | |
| parent | c5ae4dca11523dff15cfb1763b64a71b805976aa (diff) | |
Merge tag 'asoc-v3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small updates again, the sgtl5000 one fixes some newly triggered
issues due to some probe ordering changes which were introduced in the
last merge window.
Diffstat (limited to 'arch/arm/kernel/head.S')
| -rw-r--r-- | arch/arm/kernel/head.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 45e8935cae4e..9cf6063020ae 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -343,7 +343,6 @@ __turn_mmu_on_loc: | |||
| 343 | .long __turn_mmu_on_end | 343 | .long __turn_mmu_on_end |
| 344 | 344 | ||
| 345 | #if defined(CONFIG_SMP) | 345 | #if defined(CONFIG_SMP) |
| 346 | __CPUINIT | ||
| 347 | ENTRY(secondary_startup) | 346 | ENTRY(secondary_startup) |
| 348 | /* | 347 | /* |
| 349 | * Common entry point for secondary CPUs. | 348 | * Common entry point for secondary CPUs. |