From 0aa3516d196e7ad85d2b4e7efae7e0a3e6ca3123 Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Sun, 24 Oct 2010 18:16:58 +0200
Subject: [PATCH] --- yaml --- r: 215602 b: refs/heads/master c:
 ef9d9b8fb696850a95cd59ba2cd67991b6f722b3 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/i2c/Makefile        | 4 +---
 trunk/drivers/i2c/algos/Makefile  | 4 +---
 trunk/drivers/i2c/busses/Makefile | 4 +---
 trunk/drivers/i2c/muxes/Makefile  | 4 +---
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 492fb65942fd..96df3d98281f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8d7be818fbe0f8a4e7dc251712958ca369f9d45
+refs/heads/master: ef9d9b8fb696850a95cd59ba2cd67991b6f722b3
diff --git a/trunk/drivers/i2c/Makefile b/trunk/drivers/i2c/Makefile
index c00fd66388f5..23ac61e2db39 100644
--- a/trunk/drivers/i2c/Makefile
+++ b/trunk/drivers/i2c/Makefile
@@ -9,6 +9,4 @@ obj-$(CONFIG_I2C_CHARDEV)	+= i2c-dev.o
 obj-$(CONFIG_I2C_MUX)		+= i2c-mux.o
 obj-y				+= algos/ busses/ muxes/
 
-ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
diff --git a/trunk/drivers/i2c/algos/Makefile b/trunk/drivers/i2c/algos/Makefile
index 18b3e962ec09..215303f60d61 100644
--- a/trunk/drivers/i2c/algos/Makefile
+++ b/trunk/drivers/i2c/algos/Makefile
@@ -6,6 +6,4 @@ obj-$(CONFIG_I2C_ALGOBIT)	+= i2c-algo-bit.o
 obj-$(CONFIG_I2C_ALGOPCF)	+= i2c-algo-pcf.o
 obj-$(CONFIG_I2C_ALGOPCA)	+= i2c-algo-pca.o
 
-ifeq ($(CONFIG_I2C_DEBUG_ALGO),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_ALGO) := -DDEBUG
diff --git a/trunk/drivers/i2c/busses/Makefile b/trunk/drivers/i2c/busses/Makefile
index c3ef49230cba..033ad413f328 100644
--- a/trunk/drivers/i2c/busses/Makefile
+++ b/trunk/drivers/i2c/busses/Makefile
@@ -76,6 +76,4 @@ obj-$(CONFIG_I2C_STUB)		+= i2c-stub.o
 obj-$(CONFIG_SCx200_ACB)	+= scx200_acb.o
 obj-$(CONFIG_SCx200_I2C)	+= scx200_i2c.o
 
-ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG
diff --git a/trunk/drivers/i2c/muxes/Makefile b/trunk/drivers/i2c/muxes/Makefile
index bd83b5274815..6f497862bdc5 100644
--- a/trunk/drivers/i2c/muxes/Makefile
+++ b/trunk/drivers/i2c/muxes/Makefile
@@ -3,6 +3,4 @@
 
 obj-$(CONFIG_I2C_MUX_PCA954x)	+= pca954x.o
 
-ifeq ($(CONFIG_I2C_DEBUG_BUS),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG