diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 10:50:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 10:50:54 +0100 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /include/asm-m68k/machdep.h | |
| parent | ftrace: warning in kernel/trace/ftrace.c (diff) | |
| parent | Linux 2.6.28-rc2 (diff) | |
| download | linux-4944dd62de21230af039eda7cd218e9a09021d11.tar.xz linux-4944dd62de21230af039eda7cd218e9a09021d11.zip | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'include/asm-m68k/machdep.h')
| -rw-r--r-- | include/asm-m68k/machdep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/machdep.h b/include/asm-m68k/machdep.h index 26d2b91209c5..5637dcef314e 100644 --- a/include/asm-m68k/machdep.h +++ b/include/asm-m68k/machdep.h @@ -14,7 +14,7 @@ extern void (*mach_sched_init) (irq_handler_t handler); /* machine dependent irq functions */ extern void (*mach_init_IRQ) (void); extern void (*mach_get_model) (char *model); -extern int (*mach_get_hardware_list) (char *buffer); +extern void (*mach_get_hardware_list) (struct seq_file *m); /* machine dependent timer functions */ extern unsigned long (*mach_gettimeoffset)(void); extern int (*mach_hwclk)(int, struct rtc_time*); |