summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/cpu-sa1100.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-04-13 23:32:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-13 23:32:13 +0100
commita84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch)
treeba054d4b1a20dadec088fd4d8983fb5939227e46 /arch/arm/mach-sa1100/cpu-sa1100.c
parentaec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff)
parent7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff)
downloadblackbird-op-linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.tar.gz
blackbird-op-linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.zip
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-sa1100/cpu-sa1100.c')
-rw-r--r--arch/arm/mach-sa1100/cpu-sa1100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c
index 07d4e8ba3719..aaa8acf76b7b 100644
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ b/arch/arm/mach-sa1100/cpu-sa1100.c
@@ -68,7 +68,7 @@
* clock change in ROM and jump to that code from the kernel. The main
* disadvantage is that the ROM has to be modified, which is not
* possible on all SA-1100 platforms. Another disadvantage is that
- * jumping to ROM makes clock switching unecessary complicated.
+ * jumping to ROM makes clock switching unnecessary complicated.
*
* The idea behind this driver is that the memory configuration can be
* changed while running from DRAM (even with interrupts turned on!)
OpenPOWER on IntegriCloud