diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 07:12:54 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 07:12:54 +0100 |
commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
tree | 32a996a5123726b63c31a1522f230933fb967a32 /drivers/misc/ibmasm/uart.c | |
parent | [libata sata_mv] add 6042 support, fix 60xx/50xx EDMA configuration (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa (diff) | |
download | linux-18ee3610040a4c008ce08a40a5dd025241cc7e97.tar.xz linux-18ee3610040a4c008ce08a40a5dd025241cc7e97.zip |
Merge branch 'master'
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) memset(&uport, 0, sizeof(struct uart_port)); uport.irq = sp->irq; uport.uartclk = 3686400; - uport.flags = UPF_AUTOPROBE | UPF_SHARE_IRQ; + uport.flags = UPF_SHARE_IRQ; uport.iotype = UPIO_MEM; uport.membase = iomem_base; |