diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-13 03:29:52 -0500 |
| commit | 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 (patch) | |
| tree | 59b597e44902d8db8bde7deac1e7e707327c6fe6 /arch/arm/mm/proc-v7.S | |
| parent | 5144c534d16529bc469396211131e8935589f833 (diff) | |
| parent | 5b84ba26a9672e615897234fa5efd3eea2d6b295 (diff) | |
Merge branch 'topic/workq-update' into topic/misc
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 53cbe2225153..9b9ff5d949fd 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
| @@ -381,7 +381,7 @@ __v7_ca9mp_proc_info: | |||
| 381 | PMD_SECT_XN | \ | 381 | PMD_SECT_XN | \ |
| 382 | PMD_SECT_AP_WRITE | \ | 382 | PMD_SECT_AP_WRITE | \ |
| 383 | PMD_SECT_AP_READ | 383 | PMD_SECT_AP_READ |
| 384 | b __v7_ca9mp_setup | 384 | W(b) __v7_ca9mp_setup |
| 385 | .long cpu_arch_name | 385 | .long cpu_arch_name |
| 386 | .long cpu_elf_name | 386 | .long cpu_elf_name |
| 387 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS | 387 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS |
| @@ -413,7 +413,7 @@ __v7_proc_info: | |||
| 413 | PMD_SECT_XN | \ | 413 | PMD_SECT_XN | \ |
| 414 | PMD_SECT_AP_WRITE | \ | 414 | PMD_SECT_AP_WRITE | \ |
| 415 | PMD_SECT_AP_READ | 415 | PMD_SECT_AP_READ |
| 416 | b __v7_setup | 416 | W(b) __v7_setup |
| 417 | .long cpu_arch_name | 417 | .long cpu_arch_name |
| 418 | .long cpu_elf_name | 418 | .long cpu_elf_name |
| 419 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS | 419 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS |