git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
decserial.c
diff --git
a/drivers/char/decserial.c
b/drivers/char/decserial.c
index
aa14409
..
8ea2bea
100644
(file)
--- a/
drivers/char/decserial.c
+++ b/
drivers/char/decserial.c
@@
-16,7
+16,6
@@
* console device I strongly recommend to use only one.
*/
* console device I strongly recommend to use only one.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <asm/dec/machtype.h>
#include <linux/init.h>
#include <asm/dec/machtype.h>
@@
-24,20
+23,12
@@
extern int zs_init(void);
#endif
extern int zs_init(void);
#endif
-#ifdef CONFIG_DZ
-extern int dz_init(void);
-#endif
-
#ifdef CONFIG_SERIAL_CONSOLE
#ifdef CONFIG_ZS
extern void zs_serial_console_init(void);
#endif
#ifdef CONFIG_SERIAL_CONSOLE
#ifdef CONFIG_ZS
extern void zs_serial_console_init(void);
#endif
-#ifdef CONFIG_DZ
-extern void dz_serial_console_init(void);
-#endif
-
#endif
/* rs_init - starts up the serial interface -
#endif
/* rs_init - starts up the serial interface -
@@
-47,23
+38,11
@@
extern void dz_serial_console_init(void);
int __init rs_init(void)
{
int __init rs_init(void)
{
-
-#if defined(CONFIG_ZS) && defined(CONFIG_DZ)
+#ifdef CONFIG_ZS
if (IOASIC)
return zs_init();
if (IOASIC)
return zs_init();
- else
- return dz_init();
-#else
-
-#ifdef CONFIG_ZS
- return zs_init();
-#endif
-
-#ifdef CONFIG_DZ
- return dz_init();
-#endif
-
#endif
#endif
+ return -ENXIO;
}
__initcall(rs_init);
}
__initcall(rs_init);
@@
-77,21
+56,9
@@
__initcall(rs_init);
*/
static int __init decserial_console_init(void)
{
*/
static int __init decserial_console_init(void)
{
-#if
defined(CONFIG_ZS) && defined(CONFIG_DZ)
+#if
def CONFIG_ZS
if (IOASIC)
zs_serial_console_init();
if (IOASIC)
zs_serial_console_init();
- else
- dz_serial_console_init();
-#else
-
-#ifdef CONFIG_ZS
- zs_serial_console_init();
-#endif
-
-#ifdef CONFIG_DZ
- dz_serial_console_init();
-#endif
-
#endif
return 0;
}
#endif
return 0;
}