diff --git a/[refs] b/[refs] index 260594348ee4..4eb50f94522e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55d3936d30affccb904f9294a3076ccb7bf09688 +refs/heads/master: 8ae84427bb05c2921dcb0200b161b904028b5784 diff --git a/trunk/arch/arm/mach-mmp/include/mach/timex.h b/trunk/arch/arm/mach-mmp/include/mach/timex.h index 6cebbd0ca8f4..70c9f1d88c02 100644 --- a/trunk/arch/arm/mach-mmp/include/mach/timex.h +++ b/trunk/arch/arm/mach-mmp/include/mach/timex.h @@ -6,4 +6,8 @@ * published by the Free Software Foundation. */ +#ifdef CONFIG_CPU_MMP2 +#define CLOCK_TICK_RATE 6500000 +#else #define CLOCK_TICK_RATE 3250000 +#endif