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-Tag: v2.6.34-rc1~270^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d418dfae81987f09a2c13778318d56abee49529;p=pandora-kernel.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>
---

Reading git-diff-tree failed