summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-01-09 20:51:39 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 08:01:26 -0800
commitaed615a95f6dcc243daa99cc80658ad9ada95097 (patch)
tree86ed78f9de3ec9eebd33220b916715f30c4d1b39
parented653a640419cd9d1ad0f8dc176478e6634a694e (diff)
downloadlinux-aed615a95f6dcc243daa99cc80658ad9ada95097.tar.bz2
[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/Kconfig2
-rw-r--r--drivers/char/rio/rio_linux.c4
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
config RIO
tristate "Specialix RIO system support"
- depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP
+ depends on SERIAL_NONSTANDARD && BROKEN_ON_SMP && !64BIT
help
This is a driver for the Specialix RIO, a smart serial card which
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 @@
#include <linux/generic_serial.h>
#include <asm/uaccess.h>
-#if BITS_PER_LONG != 32
-# error FIXME: this driver only works on 32-bit platforms
-#endif
-
#include "linux_compat.h"
#include "typdef.h"
#include "pkt.h"