aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-03-14 15:29:18 -0400
committerSteve French <sfrench@us.ibm.com>2008-03-14 15:29:18 -0400
commitebe8912be214662c8289977fb416c1f015df4a0b (patch)
treecb82c552c602e5ae1a4bd8c11bd171bf88a58c35 /drivers/char
parent50531444fac593c8c8e3ff2e41944d9507bb4665 (diff)
parentdba92d3bc49c036056a48661d2d8fefe4c78375a (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/riscom8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 589ac6f65b9a..3f9d0a9ac36d 100644
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -1709,7 +1709,7 @@ static int __init riscom8_init_module (void)
1709 1709
1710 if (iobase || iobase1 || iobase2 || iobase3) { 1710 if (iobase || iobase1 || iobase2 || iobase3) {
1711 for(i = 0; i < RC_NBOARD; i++) 1711 for(i = 0; i < RC_NBOARD; i++)
1712 rc_board[0].base = 0; 1712 rc_board[i].base = 0;
1713 } 1713 }
1714 1714
1715 if (iobase) 1715 if (iobase)