diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/tty/rocket.c | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/tty/rocket.c')
| -rw-r--r-- | drivers/tty/rocket.c | 4 |
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 | ||