diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /drivers/misc/ibmasm/uart.c | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 | ||