The patch titled Subject: i2c/i2c-pxa: remove conditional compilation of clk code has been added to the -mm tree. Its filename is i2c-i2c-pxa-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: i2c/i2c-pxa: 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. pxa i2c also has these dummy macros defined locally. Remove them as they aren't required anymore. Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxx> Acked-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: Mike Turquette <mturquette@xxxxxxxxxx> Cc: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/i2c/busses/i2c-pxa.c | 7 ------- 1 file changed, 7 deletions(-) diff -puN drivers/i2c/busses/i2c-pxa.c~i2c-i2c-pxa-remove-conditional-compilation-of-clk-code drivers/i2c/busses/i2c-pxa.c --- a/drivers/i2c/busses/i2c-pxa.c~i2c-i2c-pxa-remove-conditional-compilation-of-clk-code +++ a/drivers/i2c/busses/i2c-pxa.c @@ -41,13 +41,6 @@ #include <asm/irq.h> -#ifndef CONFIG_HAVE_CLK -#define clk_get(dev, id) NULL -#define clk_put(clk) do { } while (0) -#define clk_disable(clk) do { } while (0) -#define clk_enable(clk) do { } while (0) -#endif - struct pxa_reg_layout { u32 ibmr; u32 idbr; _ Subject: Subject: i2c/i2c-pxa: 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