diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/char/rocket.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (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/rocket.c')
| -rw-r--r-- | drivers/char/rocket.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 8c950bf54..ae2b6ddee 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -46,21 +46,6 @@ #define ENABLE_PCI #endif -#define NEW_MODULES -#ifdef LOCAL_ROCKET_H /* We're building standalone */ -#define MODULE -#endif - -#if defined(NEW_MODULES) && defined(LOCAL_ROCKET_H) -#ifdef MODVERSIONS -#include <linux/modversions.h> -#endif -#else /* !NEW_MODULES */ -#ifdef MODVERSIONS -#define MODULE -#endif -#endif /* NEW_MODULES */ - #include <linux/module.h> #include <linux/errno.h> #include <linux/major.h> @@ -138,13 +123,6 @@ #define _INLINE_ inline -#ifndef NEW_MODULES -/* - * NB. we must include the kernel idenfication string in to install the module. - */ -/*static*/ char kernel_version[] = UTS_RELEASE; -#endif - static struct r_port *rp_table[MAX_RP_PORTS]; static struct tty_struct *rocket_table[MAX_RP_PORTS]; static unsigned int xmit_flags[NUM_BOARDS]; |