diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
| commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
| tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/mips/txx9/generic/setup_tx4938.c | |
| parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/mips/txx9/generic/setup_tx4938.c')
| -rw-r--r-- | arch/mips/txx9/generic/setup_tx4938.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/txx9/generic/setup_tx4938.c b/arch/mips/txx9/generic/setup_tx4938.c index f0844f891f0b..3925219b8973 100644 --- a/arch/mips/txx9/generic/setup_tx4938.c +++ b/arch/mips/txx9/generic/setup_tx4938.c | |||
| @@ -93,7 +93,7 @@ void __init tx4938_setup(void) | |||
| 93 | { | 93 | { |
| 94 | int i; | 94 | int i; |
| 95 | __u32 divmode; | 95 | __u32 divmode; |
| 96 | int cpuclk = 0; | 96 | unsigned int cpuclk = 0; |
| 97 | u64 ccfg; | 97 | u64 ccfg; |
| 98 | 98 | ||
| 99 | txx9_reg_res_init(TX4938_REV_PCODE(), TX4938_REG_BASE, | 99 | txx9_reg_res_init(TX4938_REV_PCODE(), TX4938_REG_BASE, |