diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 04:49:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 04:49:47 -0500 |
| commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
| tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-w90x900/nuc960.h | |
| parent | e879c862fb81b986095ae7a4676b2281c2f97957 (diff) | |
| parent | 3f1517a761905c55d1db71cb0afd359d74a76a6c (diff) | |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-w90x900/nuc960.h')
| -rw-r--r-- | arch/arm/mach-w90x900/nuc960.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-w90x900/nuc960.h b/arch/arm/mach-w90x900/nuc960.h index f0c07cbe3a82..9f6df9a00286 100644 --- a/arch/arm/mach-w90x900/nuc960.h +++ b/arch/arm/mach-w90x900/nuc960.h | |||
| @@ -12,14 +12,7 @@ | |||
| 12 | * published by the Free Software Foundation. | 12 | * published by the Free Software Foundation. |
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | 15 | #include "nuc9xx.h" | |
| 16 | struct map_desc; | ||
| 17 | struct sys_timer; | ||
| 18 | |||
| 19 | /* core initialisation functions */ | ||
| 20 | |||
| 21 | extern void nuc900_init_irq(void); | ||
| 22 | extern struct sys_timer nuc900_timer; | ||
| 23 | 16 | ||
| 24 | /* extern file from nuc960.c */ | 17 | /* extern file from nuc960.c */ |
| 25 | 18 | ||