Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / arch / arm / mach-msm / devices-qsd8x50.c

diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index f5518112284b9a67895093a625ec32263706aea0..9e1e9ce07b1a26deaf8285f0d80931cc51f2680b 100644 (file)
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -21,9 +21,9 @@
 #include <mach/irqs.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
-#include <mach/board.h>
 
 #include "devices.h"
+#include "common.h"
 
 #include <asm/mach/flash.h>
 
@@ -358,9 +358,9 @@ static struct clk_pcom_desc msm_clocks_8x50[] = {
        CLK_PCOM("tsif_ref_clk",        TSIF_REF_CLK,   NULL, 0),
        CLK_PCOM("tv_dac_clk",  TV_DAC_CLK,     NULL, 0),
        CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
-       CLK_PCOM("uart_clk",    UART1_CLK,      NULL, OFF),
-       CLK_PCOM("uart_clk",    UART2_CLK,      NULL, 0),
-       CLK_PCOM("uart_clk",    UART3_CLK,      "msm_serial.2", OFF),
+       CLK_PCOM("core",        UART1_CLK,      NULL, OFF),
+       CLK_PCOM("core",        UART2_CLK,      NULL, 0),
+       CLK_PCOM("core",        UART3_CLK,      "msm_serial.2", OFF),
        CLK_PCOM("uartdm_clk",  UART1DM_CLK,    NULL, OFF),
        CLK_PCOM("uartdm_clk",  UART2DM_CLK,    NULL, 0),
        CLK_PCOM("usb_hs_clk",  USB_HS_CLK,     NULL, OFF),