diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-08 00:21:04 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-08 00:23:00 +0400 |
| commit | 928a11ba36f999436915ea2b1eadf54301f93059 (patch) | |
| tree | 8d7cb575d528ddd4b1165e4690401c729c1eb930 /arch/arm/mach-at91/sam9_smc.h | |
| parent | 237c78beb8a988453bac1993d21f025d070a0d8d (diff) | |
| parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (diff) | |
| download | linux-928a11ba36f999436915ea2b1eadf54301f93059.tar.xz | |
Merge branch 'next/cleanup' into samsung/dt
Conflicts:
arch/arm/mach-exynos/common.c
The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.
Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/sam9_smc.h')
| -rw-r--r-- | arch/arm/mach-at91/sam9_smc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/sam9_smc.h b/arch/arm/mach-at91/sam9_smc.h index bf72cfb3455b..039c5ce17aec 100644 --- a/arch/arm/mach-at91/sam9_smc.h +++ b/arch/arm/mach-at91/sam9_smc.h @@ -30,4 +30,5 @@ struct sam9_smc_config { u8 tdf_cycles:4; }; -extern void __init sam9_smc_configure(int cs, struct sam9_smc_config* config); +extern void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config); +extern void __init at91sam9_ioremap_smc(int id, u32 addr); |