The patch titled Subject: usb/musb: remove conditional compilation of clk code has been removed from the -mm tree. Its filename was usb-musb-remove-conditional-compilation-of-clk-code.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Viresh Kumar <viresh.linux@xxxxxxxxx> Subject: usb/musb: 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. musb 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> Cc: viresh kumar <viresh.linux@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/usb/musb/musb_core.h | 8 -------- 1 file changed, 8 deletions(-) diff -puN drivers/usb/musb/musb_core.h~usb-musb-remove-conditional-compilation-of-clk-code drivers/usb/musb/musb_core.h --- a/drivers/usb/musb/musb_core.h~usb-musb-remove-conditional-compilation-of-clk-code +++ a/drivers/usb/musb/musb_core.h @@ -81,14 +81,6 @@ struct musb_ep; #define is_peripheral_active(m) (!(m)->is_host) #define is_host_active(m) ((m)->is_host) -#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 - #ifdef CONFIG_PROC_FS #include <linux/fs.h> #define MUSB_CONFIG_PROC_FS _ Patches currently in -mm which might be from viresh.linux@xxxxxxxxx are origin.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