From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri, 22 Jan 2010 19:13:27 +0000 (+0100)
Subject: pcmcia/at91_cf: don't redefine SZ_2K
X-Git-Tag: v2.6.34-rc1~270^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7432a5b6c7e38f5d89e890c6fcc00990006ab997;p=pandora-kernel.git

pcmcia/at91_cf: don't redefine SZ_2K

This fixes:

	drivers/pcmcia/at91_cf.c:55: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>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

Reading git-diff-tree failed