diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-02-09 09:43:47 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-02-09 09:43:47 +0000 |
| commit | 286ce0ac1c524849026f7472b3921b9acf557510 (patch) | |
| tree | 60488e8da4caa2d18161de901cba420cb7dc89fc /arch/arm/mach-pxa/pxa320.c | |
| parent | d5b562330ec766292a3ac54ae5e0673610bd5b3d (diff) | |
| parent | 26a552264bc92d2ec4747b1babb7cb1264908018 (diff) | |
| download | blackbird-op-linux-286ce0ac1c524849026f7472b3921b9acf557510.tar.gz blackbird-op-linux-286ce0ac1c524849026f7472b3921b9acf557510.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
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 = { static DEFINE_PXA3_CKEN(pxa320_nand, NAND, 104000000, 0); static struct clk_lookup pxa320_clkregs[] = { - INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", "NANDCLK"), + INIT_CLKREG(&clk_pxa320_nand, "pxa3xx-nand", NULL), }; static int __init pxa320_init(void) |
