diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
| commit | 847b9d01474f710e7a018186917d05e59e258309 (patch) | |
| tree | c0da8777ce350c4b048aa6ed2c41fdd109c42e92 /drivers/misc/ibmasm/uart.c | |
| parent | d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f (diff) | |
| parent | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 | ||