Commit 7041717e7c6ca33310d0c7333d9f7cebc65b2534
Committed by
Linus Torvalds
Linus Torvalds
1 parent
c311b78b2a
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n
mach-netx had its own implementation of clk routines like, clk_get{put},
clk_enable{disable}, etc. And with introduction of following patchset:
https://lkml.org/lkml/2012/4/24/154
we get compilation error for multiple definition of these routines.
Sascha had following suggestion to deal with it:
http://www.spinics.net/lists/arm-kernel/msg179369.html
So, remove this code completely.
Signed-off-by: Viresh Kumar <viresh.kumar2@arm.com>
Reported-by: Paul Gortmaker <paul.gortmaker@gmail.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 0 additions and 23 deletions Side-by-side Diff
arch/arm/mach-netx/fb.c
| ... | ... | @@ -69,29 +69,6 @@ |
| 69 | 69 | fb->fb.screen_base, fb->fb.fix.smem_start); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | -void clk_disable(struct clk *clk) | |
| 73 | -{ | |
| 74 | -} | |
| 75 | - | |
| 76 | -int clk_set_rate(struct clk *clk, unsigned long rate) | |
| 77 | -{ | |
| 78 | - return 0; | |
| 79 | -} | |
| 80 | - | |
| 81 | -int clk_enable(struct clk *clk) | |
| 82 | -{ | |
| 83 | - return 0; | |
| 84 | -} | |
| 85 | - | |
| 86 | -struct clk *clk_get(struct device *dev, const char *id) | |
| 87 | -{ | |
| 88 | - return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT); | |
| 89 | -} | |
| 90 | - | |
| 91 | -void clk_put(struct clk *clk) | |
| 92 | -{ | |
| 93 | -} | |
| 94 | - | |
| 95 | 72 | static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL); |
| 96 | 73 | |
| 97 | 74 | int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel) |