From: Randy Dunlap <rddunlap@osdl.org>

Use CONFIG_PNP consistenly, for allocating and freeing
resources, drop __ISAPNP__.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>