Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 0d418dfae81987f09a2c13778318d56abee49529

Authored by Uwe Kleine-König
Committed by Dominik Brodowski
1 parent 7432a5b6c7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 0 additions and 2 deletions Side-by-side Diff

drivers/pcmcia/omap_cf.c
Diff comments   View file @ 0d418df
... ... @@ -71,8 +71,6 @@
71 71  
72 72 #define POLL_INTERVAL (2 * HZ)
73 73  
74   -#define SZ_2K (2 * SZ_1K)
75   -
76 74 /*--------------------------------------------------------------------------*/
77 75  
78 76 static int omap_cf_ss_init(struct pcmcia_socket *s)