diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-17 10:22:56 -0800 |
|---|---|---|
| committer | AK <andi@firstfloor.org> | 2011-02-06 11:03:33 -0800 |
| commit | 2b06fa9327ca7ebc1f2001dbf7938732e6b07cce (patch) | |
| tree | b8cd662d47537e4db3ba7cd94f044ae70276fe42 /arch | |
| parent | 91d6efa40733c84a21bfd2173f1187da2077c262 (diff) | |
| download | kernel-common-2b06fa9327ca7ebc1f2001dbf7938732e6b07cce.tar.gz kernel-common-2b06fa9327ca7ebc1f2001dbf7938732e6b07cce.tar.bz2 kernel-common-2b06fa9327ca7ebc1f2001dbf7938732e6b07cce.zip | |
sparc: Do not export prom_nb{get,put}char().
[ Upstream commit 91921fef7c658b12de53376b312d071d757f7770 ]
Never used outside of console_{32,64}.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/oplib_32.h | 6 | ||||
| -rw-r--r-- | arch/sparc/include/asm/oplib_64.h | 6 | ||||
| -rw-r--r-- | arch/sparc/prom/console_32.c | 6 | ||||
| -rw-r--r-- | arch/sparc/prom/console_64.c | 6 |
4 files changed, 4 insertions, 20 deletions
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h index 66df2b15c883..ca51a666f623 100644 --- a/arch/sparc/include/asm/oplib_32.h +++ b/arch/sparc/include/asm/oplib_32.h @@ -104,12 +104,6 @@ extern int prom_getprev(void); /* Character operations to/from the console.... */ -/* Non-blocking get character from console. */ -extern int prom_nbgetchar(void); - -/* Non-blocking put character to console. */ -extern int prom_nbputchar(char character); - /* Blocking get character from console. */ extern char prom_getchar(void); diff --git a/arch/sparc/include/asm/oplib_64.h b/arch/sparc/include/asm/oplib_64.h index 7ab973d0190d..0d614e3f0871 100644 --- a/arch/sparc/include/asm/oplib_64.h +++ b/arch/sparc/include/asm/oplib_64.h @@ -96,12 +96,6 @@ extern unsigned char prom_get_idprom(char *idp_buffer, int idpbuf_size); /* Character operations to/from the console.... */ -/* Non-blocking get character from console. */ -extern int prom_nbgetchar(void); - -/* Non-blocking put character to console. */ -extern int prom_nbputchar(char character); - /* Blocking get character from console. */ extern char prom_getchar(void); diff --git a/arch/sparc/prom/console_32.c b/arch/sparc/prom/console_32.c index 5340264b78f5..2ce5acb45f2d 100644 --- a/arch/sparc/prom/console_32.c +++ b/arch/sparc/prom/console_32.c @@ -19,8 +19,7 @@ extern void restore_current(void); /* Non blocking get character from console input device, returns -1 * if no input was taken. This can be used for polling. */ -int -prom_nbgetchar(void) +static int prom_nbgetchar(void) { static char inc; int i = -1; @@ -51,8 +50,7 @@ prom_nbgetchar(void) /* Non blocking put character to console device, returns -1 if * unsuccessful. */ -int -prom_nbputchar(char c) +static int prom_nbputchar(char c) { static char outc; unsigned long flags; diff --git a/arch/sparc/prom/console_64.c b/arch/sparc/prom/console_64.c index de67fc73d91e..33a8b275d6af 100644 --- a/arch/sparc/prom/console_64.c +++ b/arch/sparc/prom/console_64.c @@ -18,8 +18,7 @@ extern int prom_stdin, prom_stdout; /* Non blocking get character from console input device, returns -1 * if no input was taken. This can be used for polling. */ -inline int -prom_nbgetchar(void) +static int prom_nbgetchar(void) { unsigned long args[7]; char inc; @@ -42,8 +41,7 @@ prom_nbgetchar(void) /* Non blocking put character to console device, returns -1 if * unsuccessful. */ -inline int -prom_nbputchar(char c) +static int prom_nbputchar(char c) { unsigned long args[7]; char outc; |