The patch titled
Subject: i2c/i2c-pxa: remove conditional compilation of clk code
has been removed from the -mm tree. Its filename was
i2c-i2c-pxa-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: 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>
Cc: viresh kumar <viresh.linux@xxxxxxxxx>
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;
_
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
