diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/sparc/prom/console.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/sparc/prom/console.c')
| -rw-r--r-- | arch/sparc/prom/console.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/prom/console.c b/arch/sparc/prom/console.c index 8d1cfb0d5068..2a007a784415 100644 --- a/arch/sparc/prom/console.c +++ b/arch/sparc/prom/console.c | |||
| @@ -17,9 +17,6 @@ | |||
| 17 | 17 | ||
| 18 | extern void restore_current(void); | 18 | extern void restore_current(void); |
| 19 | 19 | ||
| 20 | static char con_name_jmc[] = "/obio/su@"; /* "/obio/su@0,3002f8"; */ | ||
| 21 | #define CON_SIZE_JMC (sizeof(con_name_jmc)) | ||
| 22 | |||
| 23 | /* Non blocking get character from console input device, returns -1 | 20 | /* Non blocking get character from console input device, returns -1 |
| 24 | * if no input was taken. This can be used for polling. | 21 | * if no input was taken. This can be used for polling. |
| 25 | */ | 22 | */ |