diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-23 21:59:22 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 17:48:11 +0100 |
| commit | 0d418dfae81987f09a2c13778318d56abee49529 (patch) | |
| tree | efc83c3f9eed9b870b1d8a5cc5492229b91b90bb /drivers/pcmcia | |
| parent | 7432a5b6c7e38f5d89e890c6fcc00990006ab997 (diff) | |
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>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/omap_cf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 663781d2012..3ef99155239 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) |