diff options
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
-rw-r--r-- | drivers/serial/pmac_zilog.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index bf9809ed9c0..752ef07516b 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -1262,8 +1262,8 @@ static void pmz_irda_setup(struct uart_pmac_port *uap, unsigned long *baud) | |||
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | 1264 | ||
1265 | static void __pmz_set_termios(struct uart_port *port, struct termios *termios, | 1265 | static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios, |
1266 | struct termios *old) | 1266 | struct ktermios *old) |
1267 | { | 1267 | { |
1268 | struct uart_pmac_port *uap = to_pmz(port); | 1268 | struct uart_pmac_port *uap = to_pmz(port); |
1269 | unsigned long baud; | 1269 | unsigned long baud; |
@@ -1273,7 +1273,7 @@ static void __pmz_set_termios(struct uart_port *port, struct termios *termios, | |||
1273 | if (ZS_IS_ASLEEP(uap)) | 1273 | if (ZS_IS_ASLEEP(uap)) |
1274 | return; | 1274 | return; |
1275 | 1275 | ||
1276 | memcpy(&uap->termios_cache, termios, sizeof(struct termios)); | 1276 | memcpy(&uap->termios_cache, termios, sizeof(struct ktermios)); |
1277 | 1277 | ||
1278 | /* XXX Check which revs of machines actually allow 1 and 4Mb speeds | 1278 | /* XXX Check which revs of machines actually allow 1 and 4Mb speeds |
1279 | * on the IR dongle. Note that the IRTTY driver currently doesn't know | 1279 | * on the IR dongle. Note that the IRTTY driver currently doesn't know |
@@ -1313,8 +1313,8 @@ static void __pmz_set_termios(struct uart_port *port, struct termios *termios, | |||
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | /* The port lock is not held. */ | 1315 | /* The port lock is not held. */ |
1316 | static void pmz_set_termios(struct uart_port *port, struct termios *termios, | 1316 | static void pmz_set_termios(struct uart_port *port, struct ktermios *termios, |
1317 | struct termios *old) | 1317 | struct ktermios *old) |
1318 | { | 1318 | { |
1319 | struct uart_pmac_port *uap = to_pmz(port); | 1319 | struct uart_pmac_port *uap = to_pmz(port); |
1320 | unsigned long flags; | 1320 | unsigned long flags; |