git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7432a5b)
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 patch | blob | history

diff --cc drivers/pcmcia/omap_cf.c
Simple merge
Pandora Kernel Repository