From 56b5ab8d1a83a5122be8b9a733bfffc7ea9cc7aa Mon Sep 17 00:00:00 2001 From: Christian Pellegrin Date: Wed, 6 Feb 2008 01:37:44 -0800 Subject: [PATCH] --- yaml --- r: 83465 b: refs/heads/master c: c01106e573e2ce56a7cf4d65937ddf8f7fee1a18 h: refs/heads/master i: 83463: cd16182aec56b2765d5a3a06c73fd65990a7a6bb v: v3 --- [refs] | 2 +- trunk/drivers/parport/parport_serial.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cbaa5ea63d8c..495a200cbd3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc999159bbc1c542f310160c56ed8b701a7d6252 +refs/heads/master: c01106e573e2ce56a7cf4d65937ddf8f7fee1a18 diff --git a/trunk/drivers/parport/parport_serial.c b/trunk/drivers/parport/parport_serial.c index bd6ad8b38168..e2e95b36a603 100644 --- a/trunk/drivers/parport/parport_serial.c +++ b/trunk/drivers/parport/parport_serial.c @@ -77,7 +77,7 @@ static struct parport_pc_pci cards[] __devinitdata = { /* titan_110l */ { 1, { { 3, -1 }, } }, /* titan_210l */ { 1, { { 3, -1 }, } }, /* netmos_9xx5_combo */ { 1, { { 2, -1 }, }, netmos_parallel_init }, - /* netmos_9855 */ { 1, { { 0, -1 }, }, netmos_parallel_init }, + /* netmos_9855 */ { 1, { { 2, -1 }, }, netmos_parallel_init }, /* avlab_1s1p */ { 1, { { 1, 2}, } }, /* avlab_1s2p */ { 2, { { 1, 2}, { 3, 4 },} }, /* avlab_2s1p */ { 1, { { 2, 3}, } }, @@ -185,7 +185,7 @@ static struct pciserial_board pci_parport_serial_boards[] __devinitdata = { .uart_offset = 8, }, [netmos_9855] = { - .flags = FL_BASE2 | FL_BASE_BARS, + .flags = FL_BASE4 | FL_BASE_BARS, .num_ports = 1, .base_baud = 115200, .uart_offset = 8,