Use CONFIG_PNP consistenly, for allocating and freeing resources, drop __ISAPNP__. Signed-off-by: Randy Dunlap diffstat:= drivers/pcmcia/i82365.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -Naurp ./drivers/pcmcia/i82365.c~config_pnp ./drivers/pcmcia/i82365.c --- ./drivers/pcmcia/i82365.c~config_pnp 2005-01-17 12:09:53.414430296 -0800 +++ ./drivers/pcmcia/i82365.c 2005-01-17 13:36:34.831694680 -0800 @@ -660,7 +660,7 @@ static int __init identify(kio_addr_t po static int __init is_alive(u_short sock) { u_char stat; - u_short start, stop; + kio_addr_t start, stop; stat = i365_get(sock, I365_STATUS); start = i365_get_pair(sock, I365_IO(0)+I365_W_START); @@ -1447,7 +1447,7 @@ static void __exit exit_i82365(void) i365_set(i, I365_CSCINT, 0); release_region(socket[i].ioaddr, 2); } -#ifdef __ISAPNP__ +#ifdef CONFIG_PNP if (i82365_pnpdev) pnp_disable_dev(i82365_pnpdev); #endif