git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'davinci-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mx3
/
crm_regs.h
diff --git
a/arch/arm/mach-mx3/crm_regs.h
b/arch/arm/mach-mx3/crm_regs.h
index adfa3627ad842c92e67f04ea312c158ce822d205..37a8a07beda3ea3a3a6bd0c5949eadf5f6830c29 100644
(file)
--- a/
arch/arm/mach-mx3/crm_regs.h
+++ b/
arch/arm/mach-mx3/crm_regs.h
@@
-24,7
+24,7
@@
#define CKIH_CLK_FREQ_27MHZ 27000000
#define CKIL_CLK_FREQ 32768
-#define MXC_CCM_BASE
IO_ADDRESS(
CCM_BASE_ADDR)
+#define MXC_CCM_BASE
MX31_IO_ADDRESS(MX31_
CCM_BASE_ADDR)
/* Register addresses */
#define MXC_CCM_CCMR (MXC_CCM_BASE + 0x00)