diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /include/linux/isapnp.h | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'include/linux/isapnp.h')
| -rw-r--r-- | include/linux/isapnp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/isapnp.h b/include/linux/isapnp.h index 5a074285e..7a52a7c4d 100644 --- a/include/linux/isapnp.h +++ b/include/linux/isapnp.h @@ -128,7 +128,7 @@ struct isapnp_resources { struct isapnp_resources *next; /* next resource */ }; -#if defined(CONFIG_ISAPNP) || defined(CONFIG_ISAPNP_MODULE) +#if defined(CONFIG_ISAPNP) || (defined(CONFIG_ISAPNP_MODULE) && defined(MODULE)) #define __ISAPNP__ |