diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/arm/mm/proc-arm9tdmi.S | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
Diffstat (limited to 'arch/arm/mm/proc-arm9tdmi.S')
| -rw-r--r-- | arch/arm/mm/proc-arm9tdmi.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S index 8881391dfb9e..f51197ba754a 100644 --- a/arch/arm/mm/proc-arm9tdmi.S +++ b/arch/arm/mm/proc-arm9tdmi.S | |||
| @@ -51,8 +51,6 @@ ENTRY(cpu_arm9tdmi_reset) | |||
| 51 | ENDPROC(cpu_arm9tdmi_reset) | 51 | ENDPROC(cpu_arm9tdmi_reset) |
| 52 | .popsection | 52 | .popsection |
| 53 | 53 | ||
| 54 | __CPUINIT | ||
| 55 | |||
| 56 | .type __arm9tdmi_setup, #function | 54 | .type __arm9tdmi_setup, #function |
| 57 | __arm9tdmi_setup: | 55 | __arm9tdmi_setup: |
| 58 | mov pc, lr | 56 | mov pc, lr |