summaryrefslogtreecommitdiffstats
path: root/drivers/misc/ibmasm/uart.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2006-02-24 09:06:36 +0000
committerAnton Altaparmakov <aia21@cantab.net>2006-02-24 09:06:36 +0000
commitfab8d6ddf6dee2608869005d45fe97f70e4f5bdd (patch)
treefecf566e03a87b2a44c7f3363ddb5c0d4bebdca7 /drivers/misc/ibmasm/uart.c
parent64419d93a5906600af5817ad0cae3c6ecf7fb389 (diff)
parentf52ee1410d563cd409b08822492273a5bc235821 (diff)
downloadkernel-crypto-fab8d6ddf6dee2608869005d45fe97f70e4f5bdd.tar.gz
kernel-crypto-fab8d6ddf6dee2608869005d45fe97f70e4f5bdd.tar.xz
kernel-crypto-fab8d6ddf6dee2608869005d45fe97f70e4f5bdd.zip
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/misc/ibmasm/uart.c')
-rw-r--r--drivers/misc/ibmasm/uart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 7e98434cfa3..9783caf4969 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;