diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 09:14:25 -0400 |
| commit | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (patch) | |
| tree | a5dd723679582505ef3905c90f0c2c032d191b94 /arch/arm/mm/proc-arm920.S | |
| parent | 526b264163068f77c5f2409031f5e25caf3900a9 (diff) | |
| parent | c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb (diff) | |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Diffstat (limited to 'arch/arm/mm/proc-arm920.S')
| -rw-r--r-- | arch/arm/mm/proc-arm920.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S index 92bd102e3982..2e6849b41f66 100644 --- a/arch/arm/mm/proc-arm920.S +++ b/arch/arm/mm/proc-arm920.S | |||
| @@ -379,7 +379,7 @@ ENTRY(cpu_arm920_set_pte_ext) | |||
| 379 | 379 | ||
| 380 | /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */ | 380 | /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */ |
| 381 | .globl cpu_arm920_suspend_size | 381 | .globl cpu_arm920_suspend_size |
| 382 | .equ cpu_arm920_suspend_size, 4 * 3 | 382 | .equ cpu_arm920_suspend_size, 4 * 4 |
| 383 | #ifdef CONFIG_PM_SLEEP | 383 | #ifdef CONFIG_PM_SLEEP |
| 384 | ENTRY(cpu_arm920_do_suspend) | 384 | ENTRY(cpu_arm920_do_suspend) |
| 385 | stmfd sp!, {r4 - r7, lr} | 385 | stmfd sp!, {r4 - r7, lr} |