From 9842e2e1ac125d3f39435f3835cebe545fbafeab Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 2 Sep 2007 17:08:42 +0100 Subject: [PATCH] --- yaml --- r: 69535 b: refs/heads/master c: 435b6e94b88af96c3f5b5798c087978c3793400c h: refs/heads/master i: 69533: ca2727b2a6ecef351165f6d4edbd575e91311029 69531: 70b9de41b51ad2bb0fd103d6c1596250af123421 69527: f3a70643c223dbd5dc8e2a32eb823130f5d43d63 69519: e8970e99d1d533b71564c2af4a8db02f985b03c1 69503: d56e0b6e0d85f85e2c68bc6f68781e2508d7914a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/pxa25x.c | 4 ++-- trunk/arch/arm/mach-pxa/pxa27x.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5ba587b40f0..0825f818ed10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6549e6c9575c897514b183071a2b5d839cef9469 +refs/heads/master: 435b6e94b88af96c3f5b5798c087978c3793400c diff --git a/trunk/arch/arm/mach-pxa/pxa25x.c b/trunk/arch/arm/mach-pxa/pxa25x.c index 62a770121bfa..ef40c049d9e2 100644 --- a/trunk/arch/arm/mach-pxa/pxa25x.c +++ b/trunk/arch/arm/mach-pxa/pxa25x.c @@ -115,8 +115,8 @@ static struct clk pxa25x_clks[] = { INIT_CK("LCDCLK", LCD, &clk_pxa25x_lcd_ops, &pxa_device_fb.dev), INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev), INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), - INIT_CKEN("UARTCLK", STUART, 14745600, 1, &pxa_device_stuart.dev), INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev), + INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL), INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev), INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev), INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev), @@ -126,8 +126,8 @@ static struct clk pxa25x_clks[] = { INIT_CKEN("SSPCLK", SSP, 3686400, 0, NULL), INIT_CKEN("I2SCLK", I2S, 14745600, 0, NULL), INIT_CKEN("NSSPCLK", NSSP, 3686400, 0, NULL), - INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), */ + INIT_CKEN("FICPCLK", FICP, 47923000, 0, NULL), }; #ifdef CONFIG_PM diff --git a/trunk/arch/arm/mach-pxa/pxa27x.c b/trunk/arch/arm/mach-pxa/pxa27x.c index 433644edf791..f7762bf18623 100644 --- a/trunk/arch/arm/mach-pxa/pxa27x.c +++ b/trunk/arch/arm/mach-pxa/pxa27x.c @@ -136,9 +136,9 @@ static struct clk pxa27x_clks[] = { INIT_CK("LCDCLK", LCD, &clk_pxa27x_lcd_ops, &pxa_device_fb.dev), INIT_CK("CAMCLK", CAMERA, &clk_pxa27x_lcd_ops, NULL), - INIT_CKEN("UARTCLK", STUART, 14857000, 1, &pxa_device_stuart.dev), INIT_CKEN("UARTCLK", FFUART, 14857000, 1, &pxa_device_ffuart.dev), INIT_CKEN("UARTCLK", BTUART, 14857000, 1, &pxa_device_btuart.dev), + INIT_CKEN("UARTCLK", STUART, 14857000, 1, NULL), INIT_CKEN("I2SCLK", I2S, 14682000, 0, &pxa_device_i2s.dev), INIT_CKEN("I2CCLK", I2C, 32842000, 0, &pxa_device_i2c.dev),