Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-ns9xxx / regs-mem.h

diff --git a/include/asm-arm/arch-ns9xxx/regs-mem.h b/include/asm-arm/arch-ns9xxx/regs-mem.h
index 8ed8448767b93392438b042be864624bb416710c..fb455a0ed8455a77bd81fd41af28c7c342037a15 100644 (file)
--- a/include/asm-arm/arch-ns9xxx/regs-mem.h
+++ b/include/asm-arm/arch-ns9xxx/regs-mem.h
@@ -79,9 +79,9 @@
 #define MEM_SMC(x)     __REG2(0xa0700200, (x) << 3)
 
 /* Static Memory Configuration Register x: Write protect */
-#define MEM_SMC_WSMC           __REGBIT(20)
-#define MEM_SMC_WSMC_OFF               __REGVAL(MEM_SMC_WSMC, 0)
-#define MEM_SMC_WSMC_ON                        __REGVAL(MEM_SMC_WSMC, 1)
+#define MEM_SMC_PSMC           __REGBIT(20)
+#define MEM_SMC_PSMC_OFF               __REGVAL(MEM_SMC_PSMC, 0)
+#define MEM_SMC_PSMC_ON                        __REGVAL(MEM_SMC_PSMC, 1)
 
 /* Static Memory Configuration Register x: Buffer enable */
 #define MEM_SMC_BSMC           __REGBIT(19)