The patch titled Subject: usb/marvell: remove conditional compilation of clk code has been added to the -mm tree. Its filename is usb-marvell-remove-conditional-compilation-of-clk-code.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.linux@xxxxxxxxx> Subject: usb/marvell: remove conditional compilation of clk code With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h, there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif macros. Marvell usb also has these dummy macros defined locally. Remove them as they aren't required anymore. Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: Mike Turquette <mturquette@xxxxxxxxxx> Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/platform_data/mv_usb.h | 9 --------- 1 file changed, 9 deletions(-) diff -puN include/linux/platform_data/mv_usb.h~usb-marvell-remove-conditional-compilation-of-clk-code include/linux/platform_data/mv_usb.h --- a/include/linux/platform_data/mv_usb.h~usb-marvell-remove-conditional-compilation-of-clk-code +++ a/include/linux/platform_data/mv_usb.h @@ -52,13 +52,4 @@ struct mv_usb_platform_data { int (*set_vbus)(unsigned int vbus); int (*private_init)(void __iomem *opregs, void __iomem *phyregs); }; - -#ifndef CONFIG_HAVE_CLK -/* Dummy stub for clk framework */ -#define clk_get(dev, id) NULL -#define clk_put(clock) do {} while (0) -#define clk_enable(clock) do {} while (0) -#define clk_disable(clock) do {} while (0) -#endif - #endif _ Subject: Subject: usb/marvell: remove conditional compilation of clk code Patches currently in -mm which might be from viresh.linux@xxxxxxxxx are drivers-thermal-spear_thermalc-add-device-tree-probing-capability.patch i2c-i2c-pxa-remove-conditional-compilation-of-clk-code.patch usb-marvell-remove-conditional-compilation-of-clk-code.patch usb-musb-remove-conditional-compilation-of-clk-code.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