Index: stable/9/sys/boot/i386/common/cons.h
===================================================================
--- stable/9/sys/boot/i386/common/cons.h	(revision 300461)
+++ stable/9/sys/boot/i386/common/cons.h	(revision 300462)
@@ -1,34 +1,35 @@
 /*-
  * Copyright (c) 1998 Robert Nordier
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are freely
  * permitted provided that the above copyright notice and this
  * paragraph and the following disclaimer are duplicated in all
  * such forms.
  *
  * This software is provided "AS IS" and without any express or
  * implied warranties, including, without limitation, the implied
  * warranties of merchantability and fitness for a particular
  * purpose.
  *
  * $FreeBSD$
  */
 
 #ifndef _CONS_H_
 #define	_CONS_H_
 
 #define IO_KEYBOARD	1
 #define IO_SERIAL	2
 
 extern uint8_t ioctrl;
 
 void putc(int c);
 void xputc(int c);
 void putchar(int c);
 int getc(int fn);
 int xgetc(int fn);
+int getchar(void);
 int keyhit(unsigned int secs);
 void getstr(char *cmdstr, size_t cmdstrsize);
 
 #endif	/* !_CONS_H_ */
Index: stable/9/sys/boot
===================================================================
--- stable/9/sys/boot	(revision 300461)
+++ stable/9/sys/boot	(revision 300462)

Property changes on: stable/9/sys/boot
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/sys/boot:r300460
Index: stable/9/sys
===================================================================
--- stable/9/sys	(revision 300461)
+++ stable/9/sys	(revision 300462)

Property changes on: stable/9/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /stable/10/sys:r300460
Index: stable/9
===================================================================
--- stable/9	(revision 300461)
+++ stable/9	(revision 300462)

Property changes on: stable/9
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head:r299655
   Merged /stable/10:r300460