diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-17 18:14:02 -0500 |
| commit | fea83f6a9b0a90fefca16ac3534e308f6c34144b (patch) | |
| tree | 3da88c54c83a1cb8ef53db62c9c2c7fc2c2ecbe5 /arch/arm/mach-mmp/mmp2.c | |
| parent | df127ee375af4cb40b979605e0c336fc79bd38e7 (diff) | |
| parent | 2d200665c37f544f648d77a05a06ab63328f0d3a (diff) | |
Merge branch 'devel-board' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-mmp/mmp2.c')
| -rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index daf3993349f8..2e3dd08ccc3f 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c | |||
| @@ -126,7 +126,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000); | |||
| 126 | static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000); | 126 | static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000); |
| 127 | static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000); | 127 | static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000); |
| 128 | static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000); | 128 | static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000); |
| 129 | static APBC_CLK(rtc, MMP2_RTC, 0, 32768); | ||
| 130 | 129 | ||
| 131 | static APMU_CLK(nand, NAND, 0xbf, 100000000); | 130 | static APMU_CLK(nand, NAND, 0xbf, 100000000); |
| 132 | 131 | ||