Merge branch 'develop' of dxj@10.10.10.201:/home/rockchip/rk2818/kernel into develop

This commit is contained in:
root
2010-07-23 18:02:54 +08:00

View File

@@ -1302,15 +1302,15 @@ static struct rk2818_freq_info rk2818_freqs[] = {
// OP(720, 350, 720, 24, 1, 15, 41, 21),
// OP(672, 350, 672, 24, 1, 14, 41, 21),
// OP(624, 350, 624, 24, 1, 13, 41, 21),
// OP(600, 350, 600, 24, 1, 12, 41, 21),
OP(600, 350, 600, 24, 1, 12, 41, 21),
// OP(576, 350, 576, 24, 1, 12, 41, 21),
OP(528, 350, 528, 24, 1, 11, 41, 21),
// OP(528, 350, 528, 24, 1, 11, 41, 21),
// OP(480, 350, 480, 24, 1, 10, 41, 21),
// OP(450, 350, 432, 24, 1, 9, 31, 21),
// OP(432, 350, 432, 24, 1, 9, 31, 21),
// OP(384, 350, 384, 24, 1, 8, 31, 21),
// OP(336, 350, 336, 24, 1, 7, 31, 21),
OP(288, 350, 288, 24, 1, 6, 41, 21),
// OP(288, 350, 288, 24, 1, 6, 41, 21),
};
/* CPU_APB_REG5 */