diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /arch/m68k/sun3x/config.c | |
parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'arch/m68k/sun3x/config.c')
-rw-r--r-- | arch/m68k/sun3x/config.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 2b1ca2db070f..fc599fad4a54 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include "time.h" | 23 | #include "time.h" |
24 | 24 | ||
25 | volatile char *clock_va; | 25 | volatile char *clock_va; |
26 | extern volatile unsigned char *sun3_intreg; | ||
27 | 26 | ||
28 | extern void sun3_get_model(char *model); | 27 | extern void sun3_get_model(char *model); |
29 | 28 | ||