Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / arch / blackfin / kernel / early_printk.c

diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 1f4e3d2e09014533cc929b53627ead66333030f4..c8ad051742e256f8adae84d935b533582e634310 100644 (file)
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -105,10 +105,10 @@ static struct console * __init earlyserial_init(char *buf)
                cflag |= CS5;
                break;
        case 6:
-               cflag |= CS5;
+               cflag |= CS6;
                break;
        case 7:
-               cflag |= CS5;
+               cflag |= CS7;
                break;
        default:
                cflag |= CS8;