[PATCH] pcmcia/omap_cf: don't redefine SZ_2K
Tony Lindgren
tony at atomide.com
Mon Jan 25 19:27:18 EST 2010
* Uwe Kleine-König <u.kleine-koenig at pengutronix.de> [100123 12:57]:
> 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 at pengutronix.de>
Acked-by: Tony Lindgren <tony at atomide.com>
> ---
> 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 663781d..3ef9915 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)
> --
> 1.6.6
>
More information about the linux-pcmcia
mailing list