The patch titled
Subject: arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n
has been added to the -mm tree. Its filename is
arch-arm-mach-netx-fbc-reuse-dummy-clk-routines-for-config_have_clk=n.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Viresh Kumar <viresh.kumar2@xxxxxxx>
Subject: 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@xxxxxxx>
Reported-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxx>
Acked-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/mach-netx/fb.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff -puN arch/arm/mach-netx/fb.c~arch-arm-mach-netx-fbc-reuse-dummy-clk-routines-for-config_have_clk=n arch/arm/mach-netx/fb.c
--- a/arch/arm/mach-netx/fb.c~arch-arm-mach-netx-fbc-reuse-dummy-clk-routines-for-config_have_clk=n
+++ a/arch/arm/mach-netx/fb.c
@@ -69,29 +69,6 @@ void netx_clcd_remove(struct clcd_fb *fb
fb->fb.screen_base, fb->fb.fix.smem_start);
}
-void clk_disable(struct clk *clk)
-{
-}
-
-int clk_set_rate(struct clk *clk, unsigned long rate)
-{
- return 0;
-}
-
-int clk_enable(struct clk *clk)
-{
- return 0;
-}
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
- return dev && strcmp(dev_name(dev), "fb") == 0 ? NULL : ERR_PTR(-ENOENT);
-}
-
-void clk_put(struct clk *clk)
-{
-}
-
static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL);
int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel)
_
Subject: Subject: arch/arm/mach-netx/fb.c: reuse dummy clk routines for CONFIG_HAVE_CLK=n
Patches currently in -mm which might be from viresh.kumar2@xxxxxxx are
arch-arm-mach-netx-fbc-reuse-dummy-clk-routines-for-config_have_clk=n.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
