diff options
| author | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:20:23 -0400 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-09 09:20:23 -0400 |
| commit | 8118aea23c328fd4913b325af53fda9d530b1d56 (patch) | |
| tree | 099efa2ab70032885ea84f231caf2365b74661f4 /arch/arm/mach-pxa/pxa320.c | |
| parent | 432dc14fa40dea427d9ed476965001a816ff833b (diff) | |
| parent | 26a552264bc92d2ec4747b1babb7cb1264908018 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/pxa320.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index effe408c186f..36f066196fa2 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c | |||
| @@ -83,7 +83,7 @@ static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = { | |||
| 83 | static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0); | 83 | static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0); |
| 84 | 84 | ||
| 85 | static struct clk_lookup pxa320_clkregs[] = { | 85 | static struct clk_lookup pxa320_clkregs[] = { |
| 86 | INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", "NANDCLK"), | 86 | INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), |
| 87 | }; | 87 | }; |
| 88 | 88 | ||
| 89 | static int __init pxa320_init(void) | 89 | static int __init pxa320_init(void) |