[PATCH] ifdef fixes

smc91x.c: missing ifdef CONFIG_ISA around ISA-only code.
asm-arm/apm.h: ifdef CONFIG_APM breaks if APM is a module.
Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/net/smc91x.c

@@ -2154,10 +2154,12 @@ static struct device_driver smc_driver = {
 static int __init smc_init(void)
 {
 #ifdef MODULE
+#ifdef CONFIG_ISA
 	if (io == -1)
 		printk(KERN_WARNING 
 			"%s: You shouldn't use auto-probing with insmod!\n",
 			CARDNAME);
+#endif
 #endif
 
 	return driver_register(&smc_driver);

include/asm-arm/apm.h

@@ -15,7 +15,7 @@
 
 #include <linux/config.h>
 
-#ifdef CONFIG_APM
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
 
 
 #define APM_AC_OFFLINE 0