diff options
| author | Jens Axboe <axboe@fb.com> | 2014-04-16 00:02:24 +0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-04-16 00:02:24 +0400 |
| commit | f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 (patch) | |
| tree | 6d4ca8c67dc22d1c81053392078588f9ab3804b5 /drivers/clk/ti/clk-3xxx.c | |
| parent | 21f9fcd81593e201172160853b8647336fb81f4f (diff) | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (diff) | |
| download | linux-f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0.tar.xz | |
Merge tag 'v3.15-rc1' into for-3.16/core
We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
Diffstat (limited to 'drivers/clk/ti/clk-3xxx.c')
| -rw-r--r-- | drivers/clk/ti/clk-3xxx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/clk/ti/clk-3xxx.c b/drivers/clk/ti/clk-3xxx.c index d3230234f07b..0d1750a8aea4 100644 --- a/drivers/clk/ti/clk-3xxx.c +++ b/drivers/clk/ti/clk-3xxx.c @@ -130,10 +130,6 @@ static struct ti_dt_clk omap3xxx_clks[] = { DT_CLK(NULL, "dss_tv_fck", "dss_tv_fck"), DT_CLK(NULL, "dss_96m_fck", "dss_96m_fck"), DT_CLK(NULL, "dss2_alwon_fck", "dss2_alwon_fck"), - DT_CLK(NULL, "utmi_p1_gfclk", "dummy_ck"), - DT_CLK(NULL, "utmi_p2_gfclk", "dummy_ck"), - DT_CLK(NULL, "xclk60mhsp1_ck", "dummy_ck"), - DT_CLK(NULL, "xclk60mhsp2_ck", "dummy_ck"), DT_CLK(NULL, "init_60m_fclk", "dummy_ck"), DT_CLK(NULL, "gpt1_fck", "gpt1_fck"), DT_CLK(NULL, "aes2_ick", "aes2_ick"), |