diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-13 13:08:47 +0200 |
commit | a12e61df4fa1cfae7a6b76976fa65a6fcb048e3f (patch) | |
tree | 957c915298b299902aa80afa7c78e94c71b3dc25 /arch/arm/mach-msm/idle.S | |
parent | 7b27718bdb1b70166383dec91391df5534d449ee (diff) | |
parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) |
Merge commit 'v2.6.27-rc3' into x86/urgent
Diffstat (limited to 'arch/arm/mach-msm/idle.S')
-rw-r--r-- | arch/arm/mach-msm/idle.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/idle.S b/arch/arm/mach-msm/idle.S index 2b1cb7f1694..6a94f052713 100644 --- a/arch/arm/mach-msm/idle.S +++ b/arch/arm/mach-msm/idle.S @@ -1,4 +1,4 @@ -/* linux/include/asm-arm/arch-msm/idle.S +/* arch/arm/mach-msm/include/mach/idle.S * * Idle processing for MSM7K - work around bugs with SWFI. * |