diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 19:32:19 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-29 19:32:19 +0100 |
commit | 2e824ad59f678a1ff920144fda9b7dd0815fc010 (patch) | |
tree | 616d4c0d4e815493b7e7ff9842793a1b45c66ac9 | |
parent | x86/paravirt: revert exports to restore old behaviour (diff) | |
parent | sdio_uart: fix sign of paramter status in sdio_uart_receive_chars() (diff) | |
download | linux-2e824ad59f678a1ff920144fda9b7dd0815fc010.tar.xz linux-2e824ad59f678a1ff920144fda9b7dd0815fc010.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
sdio_uart: fix sign of paramter status in sdio_uart_receive_chars()
-rw-r--r-- | drivers/mmc/card/sdio_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c index d552de683110..eeea84c309e6 100644 --- a/drivers/mmc/card/sdio_uart.c +++ b/drivers/mmc/card/sdio_uart.c @@ -386,7 +386,7 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port) sdio_out(port, UART_IER, port->ier); } -static void sdio_uart_receive_chars(struct sdio_uart_port *port, int *status) +static void sdio_uart_receive_chars(struct sdio_uart_port *port, unsigned int *status) { struct tty_struct *tty = port->tty; unsigned int ch, flag; |