diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/sbus/char/sunserial.h | |
parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/sbus/char/sunserial.h')
-rw-r--r-- | drivers/sbus/char/sunserial.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/sbus/char/sunserial.h b/drivers/sbus/char/sunserial.h index e0438051b..e94a7e1da 100644 --- a/drivers/sbus/char/sunserial.h +++ b/drivers/sbus/char/sunserial.h @@ -1,4 +1,4 @@ -/* $Id: sunserial.h,v 1.17 1997/12/19 07:33:12 ecd Exp $ +/* $Id: sunserial.h,v 1.19 1999/12/01 10:45:59 davem Exp $ * sunserial.h: SUN serial driver infrastructure (including keyboards). * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) @@ -37,15 +37,17 @@ struct sunkbd_operations { extern struct sunserial_operations rs_ops; extern struct sunkbd_operations kbd_ops; -extern void sunserial_setinitfunc(unsigned long *, int (*) (void)); -extern void sunkbd_setinitfunc(unsigned long *, int (*) (void)); +extern void sunserial_setinitfunc(int (*) (void)); +extern void sunkbd_setinitfunc(int (*) (void)); extern int serial_console; +extern int stop_a_enabled; extern void sunserial_console_termios(struct console *); #ifdef CONFIG_PCI -extern void sunkbd_install_keymaps(unsigned long *, ushort **, unsigned int, char *, - char **, int, int, struct kbdiacr *, unsigned int); +extern void sunkbd_install_keymaps(ushort **, unsigned int, char *, + char **, int, int, struct kbdiacr *, + unsigned int); #endif #endif /* !(_SPARC_SUNSERIAL_H) */ |