diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-06 18:43:36 -0500 |
| commit | 6cb6524d90b6e5497e79a1474bdb2f26755d1c02 (patch) | |
| tree | fd475ac8f57a6bd39c976056324d1bc79d11b4c9 /drivers/misc/ibmasm/uart.c | |
| parent | 837e9594fc3cb9a06bddd7ecf66151334a2e13d2 (diff) | |
| parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/misc/ibmasm/uart.c')
| -rw-r--r-- | drivers/misc/ibmasm/uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c index 7e98434cfa37..9783caf49696 100644 --- a/drivers/misc/ibmasm/uart.c +++ b/drivers/misc/ibmasm/uart.c | |||
| @@ -50,7 +50,7 @@ void ibmasm_register_uart(struct service_processor *sp) | |||
| 50 | memset(&uport, 0, sizeof(struct uart_port)); | 50 | memset(&uport, 0, sizeof(struct uart_port)); |
| 51 | uport.irq = sp->irq; | 51 | uport.irq = sp->irq; |
| 52 | uport.uartclk = 3686400; | 52 | uport.uartclk = 3686400; |
| 53 | uport.flags = UPF_AUTOPROBE | UPF_SHARE_IRQ; | 53 | uport.flags = UPF_SHARE_IRQ; |
| 54 | uport.iotype = UPIO_MEM; | 54 | uport.iotype = UPIO_MEM; |
| 55 | uport.membase = iomem_base; | 55 | uport.membase = iomem_base; |
| 56 | 56 | ||