summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/m527xsim.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 16:12:14 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 16:12:14 (GMT)
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/m68k/include/asm/m527xsim.h
parent6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff)
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
downloadlinux-fsl-qoriq-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.xz
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/m68k/include/asm/m527xsim.h')
-rw-r--r--arch/m68k/include/asm/m527xsim.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/m527xsim.h b/arch/m68k/include/asm/m527xsim.h
index 74855a6..758810e 100644
--- a/arch/m68k/include/asm/m527xsim.h
+++ b/arch/m68k/include/asm/m527xsim.h
@@ -283,7 +283,7 @@
#endif
/*
- * Reset Controll Unit (relative to IPSBAR).
+ * Reset Control Unit (relative to IPSBAR).
*/
#define MCF_RCR 0x110000
#define MCF_RSR 0x110001