diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-14 12:58:10 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-14 12:58:10 +0300 |
| commit | 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e (patch) | |
| tree | cd6d6433f1c80475f36b94b7432923b4d4b7b660 /arch/arm/mach-mx3/crm_regs.h | |
| parent | becc670a1bda8f240a93e45d9794f9f79713ffdb (diff) | |
| parent | a8dfb6462a033984b99fee4122fe0799a31f5bb4 (diff) | |
| download | linux-37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e.tar.xz | |
Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Diffstat (limited to 'arch/arm/mach-mx3/crm_regs.h')
| -rw-r--r-- | arch/arm/mach-mx3/crm_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/crm_regs.h b/arch/arm/mach-mx3/crm_regs.h index adfa3627ad84..37a8a07beda3 100644 --- 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) |