Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / arch / sh / include / mach-common / mach / highlander.h

diff --git a/arch/sh/include/mach-common/mach/highlander.h b/arch/sh/include/mach-common/mach/highlander.h
index 66d3e40fd0464b9cf5f15cc8238c6bfc32844b2f..fb44c299d0337e3f454470829aa2874dbcb76e72 100644 (file)
--- a/arch/sh/include/mach-common/mach/highlander.h
+++ b/arch/sh/include/mach-common/mach/highlander.h
@@ -18,7 +18,7 @@
 #define PA_IRLPRI4      (PA_BCR+0x000a) /* Interrupt Priorty 4 */
 #define PA_RSTCTL       (PA_BCR+0x000c) /* Reset Control */
 #define PA_PCIBD        (PA_BCR+0x000e) /* PCI Board detect control */
-#define PA_PCICD        (PA_BCR+0x0010) /* PCI Conector detect control */
+#define PA_PCICD        (PA_BCR+0x0010) /* PCI Connector detect control */
 #define PA_EXTGIO       (PA_BCR+0x0016) /* Extension GPIO Control */
 #define PA_IVDRMON      (PA_BCR+0x0018) /* iVDR Moniter control */
 #define PA_IVDRCTL      (PA_BCR+0x001a) /* iVDR control */
@@ -80,7 +80,7 @@
 #define        PA_SDPOW        (PA_BCR+0x0004) /* SD Power control */
 #define        PA_RSTCTL       (PA_BCR+0x0006) /* Device Reset control */
 #define        PA_PCIBD        (PA_BCR+0x0008) /* PCI Board detect control */
-#define        PA_PCICD        (PA_BCR+0x000a) /* PCI Conector detect control */
+#define        PA_PCICD        (PA_BCR+0x000a) /* PCI Connector detect control */
 #define        PA_ZIGIO1       (PA_BCR+0x000c) /* Zigbee IO control 1 */
 #define        PA_ZIGIO2       (PA_BCR+0x000e) /* Zigbee IO control 2 */
 #define        PA_ZIGIO3       (PA_BCR+0x0010) /* Zigbee IO control 3 */