diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 18:16:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 18:16:12 +0200 |
| commit | 889e5528cbe7dff2e91caf48f4bb23c17748b984 (patch) | |
| tree | af66c15b48efb49926c475bbb4f33f48e1a76c40 /arch/arm/mach-imx/crm-regs-imx5.h | |
| parent | Merge 3.5-rc3 into usb-next (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-889e5528cbe7dff2e91caf48f4bb23c17748b984.tar.xz linux-889e5528cbe7dff2e91caf48f4bb23c17748b984.zip | |
Merge 3.5-rc4 into usb-next
This is to get the USB fixes that were merged in the 3.5-rc4 tree into usb-next
so that everyone can sync up properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-imx/crm-regs-imx5.h')
| -rw-r--r-- | arch/arm/mach-imx/crm-regs-imx5.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/crm-regs-imx5.h b/arch/arm/mach-imx/crm-regs-imx5.h index 5e11ba7daee2..5e3f1f0f4cab 100644 --- a/arch/arm/mach-imx/crm-regs-imx5.h +++ b/arch/arm/mach-imx/crm-regs-imx5.h @@ -23,7 +23,7 @@ #define MX53_DPLL1_BASE MX53_IO_ADDRESS(MX53_PLL1_BASE_ADDR) #define MX53_DPLL2_BASE MX53_IO_ADDRESS(MX53_PLL2_BASE_ADDR) #define MX53_DPLL3_BASE MX53_IO_ADDRESS(MX53_PLL3_BASE_ADDR) -#define MX53_DPLL4_BASE MX53_IO_ADDRESS(MX53_PLL3_BASE_ADDR) +#define MX53_DPLL4_BASE MX53_IO_ADDRESS(MX53_PLL4_BASE_ADDR) /* PLL Register Offsets */ #define MXC_PLL_DP_CTL 0x00 |