Merge branch btrfs-master into for-linus

[sfrench/cifs-2.6.git] / drivers / serial / crisv10.h

diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
index f36a729280bcb938919690c5a28bb6bf48ee8e0a..ea0beb46a10d1ae40eb43737d1696a4d7df70576 100644 (file)
--- 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
 };