diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2006-01-09 23:51:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:26 -0500 |
commit | aed615a95f6dcc243daa99cc80658ad9ada95097 (patch) | |
tree | 86ed78f9de3ec9eebd33220b916715f30c4d1b39 | |
parent | ed653a640419cd9d1ad0f8dc176478e6634a694e (diff) |
[PATCH] Disable rio on 64-bit platforms
Do it via Kconfig rather than via #error.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/char/Kconfig | 2 | ||||
-rw-r--r-- | drivers/char/rio/rio_linux.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 77286eb5826d..977a74e16efb 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -290,7 +290,7 @@ config SX | |||
290 | 290 | ||
291 | config RIO | 291 | config RIO |
292 | tristate "Specialix RIO system support" | 292 | tristate "Specialix RIO system support" |
293 | depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP | 293 | depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && !64BIT |
294 | help | 294 | help |
295 | This is a driver for the Specialix RIO, a smart serial card which | 295 | This is a driver for the Specialix RIO, a smart serial card which |
296 | drives an outboard box that can support up to 128 ports. Product | 296 | drives an outboard box that can support up to 128 ports. Product |
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index d7d484024e2b..2611b15b6bd1 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c | |||
@@ -56,10 +56,6 @@ | |||
56 | #include <linux/generic_serial.h> | 56 | #include <linux/generic_serial.h> |
57 | #include <asm/uaccess.h> | 57 | #include <asm/uaccess.h> |
58 | 58 | ||
59 | #if BITS_PER_LONG != 32 | ||
60 | # error FIXME: this driver only works on 32-bit platforms | ||
61 | #endif | ||
62 | |||
63 | #include "linux_compat.h" | 59 | #include "linux_compat.h" |
64 | #include "typdef.h" | 60 | #include "typdef.h" |
65 | #include "pkt.h" | 61 | #include "pkt.h" |