diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:10:38 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 23:10:38 +0100 |
| commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
| tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /arch/arm/mm/proc-v6.S | |
| parent | Merge branch 'misc2' into devel (diff) | |
| parent | ARM: PNX4008: use msecs_to_jiffies() rather than open-coding it (diff) | |
| download | linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.xz linux-9f33be2c3a80bdc2cc08342dd77fac87652e0548.zip | |
Merge branches 'clks' and 'pnx' into devel
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 395cc90c6613..7a5337ed7d68 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -59,8 +59,6 @@ ENTRY(cpu_v6_proc_fin) * to what would be the reset vector. * * - loc - location to jump to for soft reset - * - * It is assumed that: */ .align 5 ENTRY(cpu_v6_reset) |