aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/rocket.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-07 14:14:49 -0400
commit42933bac11e811f02200c944d8562a15f8ec4ff0 (patch)
treefcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/tty/rocket.c
parent2b9accbee563f535046ff2cd382d0acaa92e130c (diff)
parent25985edcedea6396277003854657b5f3cb31a628 (diff)
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
Diffstat (limited to 'drivers/tty/rocket.c')
-rw-r--r--drivers/tty/rocket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index 3780da8ad12d..036feeb5e3f6 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -2060,7 +2060,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
2060 sClockPrescale = 0x19; 2060 sClockPrescale = 0x19;
2061 rp_baud_base[i] = 230400; 2061 rp_baud_base[i] = 230400;
2062 } else { 2062 } else {
2063 /* mod 4 (devide by 5) prescale */ 2063 /* mod 4 (divide by 5) prescale */
2064 sClockPrescale = 0x14; 2064 sClockPrescale = 0x14;
2065 rp_baud_base[i] = 460800; 2065 rp_baud_base[i] = 460800;
2066 } 2066 }
@@ -2183,7 +2183,7 @@ static int __init init_ISA(int i)
2183 sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */ 2183 sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */
2184 rp_baud_base[i] = 230400; 2184 rp_baud_base[i] = 230400;
2185 } else { 2185 } else {
2186 sClockPrescale = 0x14; /* mod 4 (devide by 5) prescale */ 2186 sClockPrescale = 0x14; /* mod 4 (divide by 5) prescale */
2187 rp_baud_base[i] = 460800; 2187 rp_baud_base[i] = 460800;
2188 } 2188 }
2189 2189