diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
| commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
| tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /arch/arm/mach-pxa/pxa300.c | |
| parent | 6f3529f00a0a9ac06413d18d3926adf099cb59af (diff) | |
| parent | 851b147e4411df6a1e7e90e2a609773c277eefd2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/pxa300.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa300.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 4ba6d21f851c..f4af6e2bef89 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c | |||
| @@ -84,9 +84,11 @@ static struct mfp_addr_map pxa310_mfp_addr_map[] __initdata = { | |||
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0); | 86 | static DEFINE_PXA3_CKEN(common_nand, NAND, 156000000, 0); |
| 87 | static DEFINE_PXA3_CKEN(gcu, PXA300_GCU, 0, 0); | ||
| 87 | 88 | ||
| 88 | static struct clk_lookup common_clkregs[] = { | 89 | static struct clk_lookup common_clkregs[] = { |
| 89 | INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL), | 90 | INIT_CLKREG(&clk_common_nand, "pxa3xx-nand", NULL), |
| 91 | INIT_CLKREG(&clk_gcu, "pxa3xx-gcu", NULL), | ||
| 90 | }; | 92 | }; |
| 91 | 93 | ||
| 92 | static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0); | 94 | static DEFINE_PXA3_CKEN(pxa310_mmc3, MMC3, 19500000, 0); |