From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu, 17 Dec 2009 13:56:57 +0000 (+0100)
Subject: [ARM] pxa/ttc_dkb: remove duplicate macro definition
X-Git-Tag: v2.6.33-rc4~84^2~5^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c57b9343437a801f0a93b272df8eabf1df102034;p=karo-tx-linux.git

[ARM] pxa/ttc_dkb: remove duplicate macro definition

ARRAY_AND_SIZE is already defined arch/arm/mach-mmp/common.h which is
already included.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Bin Yang <bin.yang@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---

diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 8f49b2b12608..b22dec4abf78 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -24,8 +24,6 @@
 
 #include "common.h"
 
-#define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
-
 static unsigned long ttc_dkb_pin_config[] __initdata = {
 	/* UART2 */
 	GPIO47_UART2_RXD,