summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-21 16:19:34 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-21 16:19:34 -0800
commit06165752c8dfd7c6a3f3186bd6dec86a70895c72 (patch)
treeb8bfcd0ec0a61ec187fc67d941f9200a3a3c5f0d /include
parent597592d951cdca8e5edb29f7e8174f633a69685a (diff)
parent717a54ad6cb4b1782a26ae0eaebc8bd49c56c66e (diff)
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4835/1: Fix stale comment in struct machine_desc description [ARM] 4829/1: add .get method to pxa-cpufreq to silence a warning [ARM] 4828/1: fix 3 warnings in drivers/video/pxafb.c [ARM] 4827/1: fix two warnings in drivers/i2c/busses/i2c-pxa.c [ARM] 4826/1: Orion: Register the RTC interrupt on the TS-209 [ARM] pxa: fix clock lookup to find specific device clocks
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/mach/arch.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index c59fad18e73b..bcc8aed7c9a9 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -17,7 +17,7 @@ struct sys_timer;
struct machine_desc {
/*
* Note! The first four elements are used
- * by assembler code in head-armv.S
+ * by assembler code in head.S, head-common.S
*/
unsigned int nr; /* architecture number */
unsigned int phys_io; /* start of physical io */