summaryrefslogtreecommitdiffstats
path: root/drivers/serial/crisv10.h
diff options
context:
space:
mode:
authorClaudio Scordino <claudio@evidence.eu.com>2009-04-07 17:48:19 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 17:44:05 +0200
commit6fd1af4cf98936f4034caf8f132c7826a6ffd0fa (patch)
tree08d898628d33527b441b26e7a59eb203fefad867 /drivers/serial/crisv10.h
parenttty: Correct inline types for tty_driver_kref_get() (diff)
downloadlinux-6fd1af4cf98936f4034caf8f132c7826a6ffd0fa.tar.xz
linux-6fd1af4cf98936f4034caf8f132c7826a6ffd0fa.zip
tty: Use the generic RS485 ioctl on CRIS
Use the new general RS485 Linux data structure (introduced by Alan with commit number c26c56c0f40e200e61d1390629c806f6adaffbcc) in the Cris architecture too (currently, Cris still uses the old private data structure instead of the new one). Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Tested-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si> Tested-by: Janez Cufer <janez.cufer@cetrtapot.si> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/serial/crisv10.h')
-rw-r--r--drivers/serial/crisv10.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
index f36a729280bc..ea0beb46a10d 100644
--- a/drivers/serial/crisv10.h
+++ b/drivers/serial/crisv10.h
@@ -125,7 +125,7 @@ struct e100_serial {
int errorcode;
#ifdef CONFIG_ETRAX_RS485
- struct rs485_control rs485; /* RS-485 support */
+ struct serial_rs485 rs485; /* RS-485 support */
#endif
};