diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/tty/rocket.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
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 | ||