From: Pavel Machek <pavel@ucw.cz> Fix macro abuse in pcmcia. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Andrew Morton <akpm@osdl.org> --- drivers/pcmcia/cistpl.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/pcmcia/cistpl.c~pcmcia-avoid-macro-usage drivers/pcmcia/cistpl.c --- 25/drivers/pcmcia/cistpl.c~pcmcia-avoid-macro-usage Wed Sep 7 16:00:24 2005 +++ 25-akpm/drivers/pcmcia/cistpl.c Wed Sep 7 16:00:24 2005 @@ -60,9 +60,9 @@ static const u_int exponent[] = { /* Parameters that can be set with 'insmod' */ -#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444) - -INT_MODULE_PARM(cis_width, 0); /* 16-bit CIS? */ +/* 16-bit CIS? */ +static int cis_width = 0; +module_param(cis_width, int, 0444); void release_cis_mem(struct pcmcia_socket *s) { _