diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-22 20:13:27 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 17:48:10 +0100 |
| commit | 7432a5b6c7e38f5d89e890c6fcc00990006ab997 (patch) | |
| tree | 734a433ddbd047d12147fa1a08955dc0afe33fe1 /drivers/pcmcia | |
| parent | 4aa50bc9c2b2d5ab5c63658e0fadad03a08835cc (diff) | |
| download | blackbird-op-linux-7432a5b6c7e38f5d89e890c6fcc00990006ab997.tar.gz blackbird-op-linux-7432a5b6c7e38f5d89e890c6fcc00990006ab997.zip | |
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>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index e1dccedc5960..5d228071ec69 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -52,8 +52,6 @@ struct at91_cf_socket { unsigned long phys_baseaddr; }; -#define SZ_2K (2 * SZ_1K) - static inline int at91_cf_present(struct at91_cf_socket *cf) { return !gpio_get_value(cf->board->det_pin); |
