diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-27 16:40:03 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-27 16:40:03 +0200 |
| commit | dc1632321ba1e93dde25870e96cebe21b7d52517 (patch) | |
| tree | d52d934c79b23f91654c571d983e1a6ec41b71fd /arch/arm/mm/proc-arm922.S | |
| parent | ASoC: Move call to snd_soc_dapm_new_widgets() after snd_soc_dapm_auto_nc_code... (diff) | |
| parent | ASoC: dmic: Convert table based DAPM setup (diff) | |
| download | linux-dc1632321ba1e93dde25870e96cebe21b7d52517.tar.xz linux-dc1632321ba1e93dde25870e96cebe21b7d52517.zip | |
Merge remote-tracking branch 'asoc/topic/dmic' into asoc-core
Diffstat (limited to 'arch/arm/mm/proc-arm922.S')
| -rw-r--r-- | arch/arm/mm/proc-arm922.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index 4464c49d7449..2a758b06c6f6 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S @@ -388,8 +388,6 @@ ENTRY(cpu_arm922_set_pte_ext) #endif /* CONFIG_MMU */ mov pc, lr - __CPUINIT - .type __arm922_setup, #function __arm922_setup: mov r0, #0 |