From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Sat, 23 Jan 2010 20:59:22 +0000 (+0100)
Subject: pcmcia/omap_cf: don't redefine SZ_2K
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0d418dfae81987f09a2c13778318d56abee49529;p=deliverable%2Flinux.git

pcmcia/omap_cf: don't redefine SZ_2K

This fixes:

	drivers/pcmcia/omap_cf.c:74:1: warning: "SZ_2K" redefined

Since

	c1191b0 ([ARM] Kirkwood: create a mapping for the Security Accelerator SRAM)

SZ_2K is defined in arch/arm/include/asm/sizes.h.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 663781d20129..3ef991552398 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -71,8 +71,6 @@ struct omap_cf_socket {
 
 #define	POLL_INTERVAL		(2 * HZ)
 
-#define	SZ_2K			(2 * SZ_1K)
-
 /*--------------------------------------------------------------------------*/
 
 static int omap_cf_ss_init(struct pcmcia_socket *s)