diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /arch/arm/mach-kirkwood | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/vmalloc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index a4a55c199d77..d0606774dea7 100644 --- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <mach/bridge-regs.h> | 9 | #include <mach/bridge-regs.h> |
| 10 | 10 | ||
| 11 | .macro addruart,rx | 11 | .macro addruart, rx, tmp |
| 12 | mrc p15, 0, \rx, c1, c0 | 12 | mrc p15, 0, \rx, c1, c0 |
| 13 | tst \rx, #1 @ MMU enabled? | 13 | tst \rx, #1 @ MMU enabled? |
| 14 | ldreq \rx, =KIRKWOOD_REGS_PHYS_BASE | 14 | ldreq \rx, =KIRKWOOD_REGS_PHYS_BASE |
diff --git a/arch/arm/mach-kirkwood/include/mach/vmalloc.h b/arch/arm/mach-kirkwood/include/mach/vmalloc.h index 8f48260dcdad..bf162ca3d2c1 100644 --- a/arch/arm/mach-kirkwood/include/mach/vmalloc.h +++ b/arch/arm/mach-kirkwood/include/mach/vmalloc.h | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | * arch/arm/mach-kirkwood/include/mach/vmalloc.h | 2 | * arch/arm/mach-kirkwood/include/mach/vmalloc.h |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #define VMALLOC_END 0xfe800000 | 5 | #define VMALLOC_END 0xfe800000UL |