diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 12:14:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 12:14:00 -0400 |
| commit | 63c422afe3739b68bec0b5c42807d1450c951caf (patch) | |
| tree | 2cdbcbd4c6fcea69fbe0b164242336c38168f631 /arch/arm/mm | |
| parent | 6f3a28f7d1f0a65a78443c273b6e8ec01becf301 (diff) | |
| parent | d14b272bc63f35a8f20b4b1df16c080b8d24f8f1 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3848/1: pxafb: Add option of fixing video modes and spitz QVGA mode support
[ARM] 3880/1: remove the last trace of iop31x support
[ARM] 3879/1: ep93xx: instantiate platform devices for ep93xx ethernet
[ARM] 3809/3: get rid of 4 megabyte kernel image size limit
[ARM] Fix XIP_KERNEL build error in arch/arm/mm/mmu.c
[ARM] 3874/1: Remove leftover usage of asm/timeofday.h
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index e566cbe4b222..f866bf6b97d4 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | 28 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); |
| 29 | 29 | ||
| 30 | extern void _stext, __data_start, _end; | 30 | extern void _stext, _etext, __data_start, _end; |
| 31 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 31 | extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
| 32 | 32 | ||
| 33 | /* | 33 | /* |