diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/arm/mm/proc-v6.S | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index 5485c821101c..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) | |||
| 59 | * to what would be the reset vector. | 59 | * to what would be the reset vector. |
| 60 | * | 60 | * |
| 61 | * - loc - location to jump to for soft reset | 61 | * - loc - location to jump to for soft reset |
| 62 | * | ||
| 63 | * It is assumed that: | ||
| 64 | */ | 62 | */ |
| 65 | .align 5 | 63 | .align 5 |
| 66 | ENTRY(cpu_v6_reset) | 64 | ENTRY(cpu_v6_reset) |
| @@ -254,10 +252,9 @@ __pj4_v6_proc_info: | |||
| 254 | .long 0x560f5810 | 252 | .long 0x560f5810 |
| 255 | .long 0xff0ffff0 | 253 | .long 0xff0ffff0 |
| 256 | .long PMD_TYPE_SECT | \ | 254 | .long PMD_TYPE_SECT | \ |
| 257 | PMD_SECT_BUFFERABLE | \ | ||
| 258 | PMD_SECT_CACHEABLE | \ | ||
| 259 | PMD_SECT_AP_WRITE | \ | 255 | PMD_SECT_AP_WRITE | \ |
| 260 | PMD_SECT_AP_READ | 256 | PMD_SECT_AP_READ | \ |
| 257 | PMD_FLAGS | ||
| 261 | .long PMD_TYPE_SECT | \ | 258 | .long PMD_TYPE_SECT | \ |
| 262 | PMD_SECT_XN | \ | 259 | PMD_SECT_XN | \ |
| 263 | PMD_SECT_AP_WRITE | \ | 260 | PMD_SECT_AP_WRITE | \ |