diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:14:07 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:14:07 -0500 |
| commit | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (patch) | |
| tree | 8cced517382b7087df4e89a9e2a00ccac9676a92 /arch/arm/mach-at91/sam9_smc.h | |
| parent | 155bc27fdfbdf65a07a4f8ef3eafa25e57d8b511 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
Merge branch 'samsung/cleanup' into samsung/driver
Conflicts:
arch/arm/mach-s5p64x0/cpu.c -> common.c
More changes to a file that got moved into common.c,
see previous conflict resolutions.
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 { | |||
| 30 | u8 tdf_cycles:4; | 30 | u8 tdf_cycles:4; |
| 31 | }; | 31 | }; |
| 32 | 32 | ||
| 33 | extern void __init sam9_smc_configure(int cs, struct sam9_smc_config* config); | 33 | extern void __init sam9_smc_configure(int id, int cs, struct sam9_smc_config* config); |
| 34 | extern void __init at91sam9_ioremap_smc(int id, u32 addr); | ||