]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
pcmcia/omap_cf: don't redefine SZ_2K
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sat, 23 Jan 2010 20:59:22 +0000 (21:59 +0100)
committerDominik Brodowski <linux@dominikbrodowski.net>
Wed, 17 Feb 2010 16:48:11 +0000 (17:48 +0100)
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>
drivers/pcmcia/omap_cf.c

index 663781d201295b6ec93f59fc62ea39b143380de9..3ef991552398095ddc9de8b7f2505be88108437f 100644 (file)
@@ -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)