summaryrefslogtreecommitdiffstats
path: root/drivers/char/misc.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-04-05 04:55:58 +0000
commit74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch)
tree7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/char/misc.c
parentee6374c8b0d333c08061c6a97bc77090d7461225 (diff)
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to switch to another getty like getty_ps. This commit also includes a fix for a setitimer bug which did prevent getty_ps from working on older kernels.
Diffstat (limited to 'drivers/char/misc.c')
-rw-r--r--drivers/char/misc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 8dc9ef350..89931b06d 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -75,7 +75,6 @@ extern int rtc_MK48T08_init(void);
extern int ds1286_init(void);
extern int dsp56k_init(void);
extern int radio_init(void);
-extern int pc110pad_init(void);
extern int pmu_device_init(void);
extern int qpmouse_init(void);
extern int tosh_init(void);
@@ -249,9 +248,6 @@ int __init misc_init(void)
#if defined CONFIG_82C710_MOUSE
qpmouse_init();
#endif
-#ifdef CONFIG_PC110_PAD
- pc110pad_init();
-#endif
#ifdef CONFIG_MVME16x
rtc_MK48T08_init();
#endif