From 5d6786001696ee646d0521b110438debf6e951b7 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.linux@gmail.com>
Date: Mon, 30 Jul 2012 14:39:30 -0700
Subject: [PATCH] --- yaml --- r: 319882 b: refs/heads/master c:
 dd995c9d82b6eedb2e704daf44e903da0b7f6ac1 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/i2c/busses/i2c-pxa.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e1b00c0c073c..74701060eb9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01da40bf8791434455d6e56c711eb224ddbf3161
+refs/heads/master: dd995c9d82b6eedb2e704daf44e903da0b7f6ac1
diff --git a/trunk/drivers/i2c/busses/i2c-pxa.c b/trunk/drivers/i2c/busses/i2c-pxa.c
index a997c7d3f95d..1034d93fb838 100644
--- a/trunk/drivers/i2c/busses/i2c-pxa.c
+++ b/trunk/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;