diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:20:03 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-02 17:21:21 +0200 |
commit | 87c35c56f4beed9e43bd41427643215655a31c3d (patch) | |
tree | a4a29370bbb16ecf1864751def0a9b7ad0629476 /arch/arm/mach-at91/setup.c | |
parent | d1ef5bd711b6b01e6a73cf186245d19939882706 (diff) | |
parent | ee9581d7adaeb2d04b01e3567e2355ceb5f43ad1 (diff) | |
download | talos-obmc-linux-87c35c56f4beed9e43bd41427643215655a31c3d.tar.gz talos-obmc-linux-87c35c56f4beed9e43bd41427643215655a31c3d.zip |
Merge branch 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/newsoc
From: Linus Walleij <linus.walleij@linaro.org>:
Core support for the U9540 after finalized review
* 'ux500-u9540-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (2 commits)
ARM: ux500: ioremap differences for DB9540
ARM: ux500: core U9540 support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
-rw-r--r-- | arch/arm/mach-at91/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index 34c9c27c917e..944bffb08991 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -54,6 +54,7 @@ void __init at91_init_interrupts(unsigned int *priority) } void __iomem *at91_ramc_base[2]; +EXPORT_SYMBOL_GPL(at91_ramc_base); void __init at91_ioremap_ramc(int id, u32 addr, u32 size) { @@ -298,6 +299,7 @@ void __init at91_ioremap_rstc(u32 base_addr) } void __iomem *at91_matrix_base; +EXPORT_SYMBOL_GPL(at91_matrix_base); void __init at91_ioremap_matrix(u32 base_addr) { |