Commit 0b479e12 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[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: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2408e5f9
No related merge requests found
......@@ -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);
......
......@@ -15,7 +15,7 @@
#include <linux/config.h>
#ifdef CONFIG_APM
#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
#define APM_AC_OFFLINE 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment