aboutsummaryrefslogtreecommitdiffstats
path: root/arch/unicore32
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
commit42933bac11e811f02200c944d8562a15f8ec4ff0 (patch)
treefcdd9afe56eb0e746565ddd1f92f22d36678b843 /arch/unicore32
parent2b9accbee563f535046ff2cd382d0acaa92e130c (diff)
parent25985edcedea6396277003854657b5f3cb31a628 (diff)
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
Diffstat (limited to 'arch/unicore32')
-rw-r--r--arch/unicore32/include/mach/regs-umal.h4
-rw-r--r--arch/unicore32/kernel/head.S2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/unicore32/include/mach/regs-umal.h b/arch/unicore32/include/mach/regs-umal.h
index 885bb62fee71..aa22df74e11d 100644
--- a/arch/unicore32/include/mach/regs-umal.h
+++ b/arch/unicore32/include/mach/regs-umal.h
@@ -52,7 +52,7 @@
52 */ 52 */
53#define UMAL_MIISTATUS (PKUNITY_UMAL_BASE + 0x0030) 53#define UMAL_MIISTATUS (PKUNITY_UMAL_BASE + 0x0030)
54/* 54/*
55 * MII Managment Indicator UMAL_MIIIDCT 55 * MII Management Indicator UMAL_MIIIDCT
56 */ 56 */
57#define UMAL_MIIIDCT (PKUNITY_UMAL_BASE + 0x0034) 57#define UMAL_MIIIDCT (PKUNITY_UMAL_BASE + 0x0034)
58/* 58/*
@@ -91,7 +91,7 @@
91#define UMAL_FIFORAM6 (PKUNITY_UMAL_BASE + 0x0078) 91#define UMAL_FIFORAM6 (PKUNITY_UMAL_BASE + 0x0078)
92#define UMAL_FIFORAM7 (PKUNITY_UMAL_BASE + 0x007c) 92#define UMAL_FIFORAM7 (PKUNITY_UMAL_BASE + 0x007c)
93 93
94/* MAHBE MODUEL OF UMAL */ 94/* MAHBE MODULE OF UMAL */
95/* UMAL's MAHBE module interfaces to the host system through 32-bit AHB Master 95/* UMAL's MAHBE module interfaces to the host system through 32-bit AHB Master
96 * and Slave ports.Registers within the M-AHBE provide Control and Status 96 * and Slave ports.Registers within the M-AHBE provide Control and Status
97 * information concerning these transfers. 97 * information concerning these transfers.
diff --git a/arch/unicore32/kernel/head.S b/arch/unicore32/kernel/head.S
index 92255f3ab6a7..8caf322e110d 100644
--- a/arch/unicore32/kernel/head.S
+++ b/arch/unicore32/kernel/head.S
@@ -164,7 +164,7 @@ ENTRY(stext)
164ENDPROC(stext) 164ENDPROC(stext)
165 165
166/* 166/*
167 * Enable the MMU. This completely changes the stucture of the visible 167 * Enable the MMU. This completely changes the structure of the visible
168 * memory space. You will not be able to trace execution through this. 168 * memory space. You will not be able to trace execution through this.
169 * 169 *
170 * r0 = cp#0 control register 170 * r0 = cp#0 control register