diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-12 22:34:11 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-12 22:34:11 -0700 |
commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /arch/arm/mach-mv78xx0/addr-map.c | |
parent | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (diff) | |
parent | 7f744b17140af1a9c8804a1c81c9dae6bb52a7fb (diff) | |
download | linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.tar.bz2 |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
* 'clk' of git://github.com/hzhuang1/linux:
ARM: mmp: remove unused definition in APBC and APMU
ARM: mmp: move mmp2 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: make private clock definition exclude from common clock
+ Linux 3.6-rc4
Diffstat (limited to 'arch/arm/mach-mv78xx0/addr-map.c')
-rw-r--r-- | arch/arm/mach-mv78xx0/addr-map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c index 7764d9386f2a..137e479d15a0 100644 --- a/arch/arm/mach-mv78xx0/addr-map.c +++ b/arch/arm/mach-mv78xx0/addr-map.c @@ -38,7 +38,7 @@ #define WIN0_OFF(n) (BRIDGE_VIRT_BASE + 0x0000 + ((n) << 4)) #define WIN8_OFF(n) (BRIDGE_VIRT_BASE + 0x0900 + (((n) - 8) << 4)) -static void __init __iomem *win_cfg_base(int win) +static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, int win) { /* * Find the control register base address for this window. |