mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-02 08:34:20 +08:00
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>
This commit is contained in:
parent
7432a5b6c7
commit
0d418dfae8
@ -71,8 +71,6 @@ struct omap_cf_socket {
|
|||||||
|
|
||||||
#define POLL_INTERVAL (2 * HZ)
|
#define POLL_INTERVAL (2 * HZ)
|
||||||
|
|
||||||
#define SZ_2K (2 * SZ_1K)
|
|
||||||
|
|
||||||
/*--------------------------------------------------------------------------*/
|
/*--------------------------------------------------------------------------*/
|
||||||
|
|
||||||
static int omap_cf_ss_init(struct pcmcia_socket *s)
|
static int omap_cf_ss_init(struct pcmcia_socket *s)
|
||||||
|
Loading…
Reference in New Issue
Block a user