diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:01:00 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:01:00 -0500 |
| commit | a07613a54d700a974f3a4a657da78ef5d097315d (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/arm/mach-netx/generic.h | |
| parent | 65db039bf7402f0a5b19cbf6dcff55ebea433b8b (diff) | |
| parent | 928a11ba36f999436915ea2b1eadf54301f93059 (diff) | |
Merge branch 'samsung/dt' into samsung/cleanup
Conflicts:
arch/arm/mach-s3c64xx/Makefile
arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pv210/Makefile
Pull in previously resolved conflicts:
The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-netx/generic.h')
| -rw-r--r-- | arch/arm/mach-netx/generic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-netx/generic.h b/arch/arm/mach-netx/generic.h index ede2d35341c3..9b915119b8d6 100644 --- a/arch/arm/mach-netx/generic.h +++ b/arch/arm/mach-netx/generic.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | extern void __init netx_map_io(void); | 20 | extern void __init netx_map_io(void); |
| 21 | extern void __init netx_init_irq(void); | 21 | extern void __init netx_init_irq(void); |
| 22 | extern void netx_restart(char, const char *); | ||
| 22 | 23 | ||
| 23 | struct sys_timer; | 24 | struct sys_timer; |
| 24 | extern struct sys_timer netx_timer; | 25 | extern struct sys_timer netx_timer; |