diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/char/rocket.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/char/rocket.c')
| -rw-r--r-- | drivers/char/rocket.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 22f936e19..29d4227ff 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -42,16 +42,14 @@ #include <linux/config.h> #include <linux/version.h> -#if (defined(CONFIG_PCI) && (LINUX_VERSION_CODE >= 131072)) +#ifdef CONFIG_PCI #define ENABLE_PCI #endif -#if (LINUX_VERSION_CODE > 66304) #define NEW_MODULES #ifdef LOCAL_ROCKET_H /* We're building standalone */ #define MODULE #endif -#endif #ifdef NEW_MODULES #ifdef MODVERSIONS @@ -200,13 +198,6 @@ MODULE_PARM(support_low_speed, "i"); MODULE_PARM_DESC(support_low_speed, "0 means support 50 baud, 1 means support 460400 baud"); #endif -/* - * Provide backwards compatibility for kernels prior to 2.1.8. - */ -#if (LINUX_VERSION_CODE < 0x20000) -typedef dev_t kdev_t; -#endif - #if (LINUX_VERSION_CODE < 131336) int copy_from_user(void *to, const void *from_user, unsigned long len) { @@ -1757,13 +1748,8 @@ static void rp_put_char(struct tty_struct *tty, unsigned char ch) } } -#if (LINUX_VERSION_CODE > 66304) static int rp_write(struct tty_struct * tty, int from_user, const unsigned char *buf, int count) -#else -static int rp_write(struct tty_struct * tty, int from_user, - unsigned char *buf, int count) -#endif { struct r_port * info = (struct r_port *)tty->driver_data; CHANNEL_t *cp; |