summaryrefslogtreecommitdiffstats
path: root/drivers/pnp
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-06-19 22:45:37 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-06-19 22:45:37 +0000
commit6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch)
tree0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/pnp
parentecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff)
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine status unknown.
Diffstat (limited to 'drivers/pnp')
-rw-r--r--drivers/pnp/isapnp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pnp/isapnp.c b/drivers/pnp/isapnp.c
index 06bf94664..497879619 100644
--- a/drivers/pnp/isapnp.c
+++ b/drivers/pnp/isapnp.c
@@ -2059,14 +2059,14 @@ static void isapnp_free_all_resources(void)
if (isapnp_rdp >= 0x203 && isapnp_rdp <= 0x3ff)
release_resource(isapnp_rdp_res);
#ifdef MODULE
+#ifdef CONFIG_PROC_FS
+ isapnp_proc_done();
+#endif
while (!list_empty(&isapnp_cards)) {
struct list_head *list = isapnp_cards.next;
list_del(list);
isapnp_free_card(pci_bus_b(list));
}
-#ifdef CONFIG_PROC_FS
- isapnp_proc_done();
-#endif
#endif
}