diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /arch/powerpc/sysdev/qe_lib/qe.c | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/powerpc/sysdev/qe_lib/qe.c')
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c index e4223226a7a8..e3d71e083f35 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/arch/powerpc/sysdev/qe_lib/qe.c | |||
| @@ -174,8 +174,7 @@ void qe_setbrg(u32 brg, u32 rate) | |||
| 174 | u32 divisor, tempval; | 174 | u32 divisor, tempval; |
| 175 | int div16 = 0; | 175 | int div16 = 0; |
| 176 | 176 | ||
| 177 | bp = &qe_immr->brg.brgc1; | 177 | bp = &qe_immr->brg.brgc[brg]; |
| 178 | bp += brg; | ||
| 179 | 178 | ||
| 180 | divisor = (get_brg_clk() / rate); | 179 | divisor = (get_brg_clk() / rate); |
| 181 | if (divisor > QE_BRGC_DIVISOR_MAX + 1) { | 180 | if (divisor > QE_BRGC_DIVISOR_MAX + 1) { |