diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 10:19:52 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 10:19:52 (GMT) |
| commit | 4210606b19852dce52ed1a687db816695b6048e1 (patch) | |
| tree | fd0762f88dc54560d87fc1e523741d92228f6a9c /arch/arm/mm/proc-v6.S | |
| parent | 4d8cfa4642f7d8fafa4d60f05dd34fe8c3b9fa45 (diff) | |
| parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
| download | linux-fsl-qoriq-4210606b19852dce52ed1a687db816695b6048e1.tar.xz | |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-pxa
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 2d1ef87..1128064 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -180,8 +180,6 @@ ENDPROC(cpu_v6_do_resume) .align - __CPUINIT - /* * __v6_setup * |