aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/serial/m32r_sio.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
committerPaul Mackerras <paulus@samba.org>2006-02-10 16:51:29 +1100
commitd6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch)
treeeeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/serial/m32r_sio.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (diff)
parent[PATCH] powerpc: Add FSL USB node to documentation (diff)
downloadwireguard-linux-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.xz
wireguard-linux-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.zip
Merge ../powerpc-merge
Diffstat (limited to 'drivers/serial/m32r_sio.c')
-rw-r--r--drivers/serial/m32r_sio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index b48066a64a7d..242a04104393 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -80,7 +80,7 @@
#include <asm/serial.h>
/* Standard COM flags */
-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
/*
* SERIAL_PORT_DFNS tells us about built-in ports that have no