---

yaml --- r: 45968 b: refs/heads/master c: 6855036 h: refs/heads/master v: v3
git-mirror · Jan 27, 2007 · c94f11e · c94f11e
1 parent 037722e
commit c94f11e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82ab1eeceba6705cd5a8815c48eb03af1dada744
+refs/heads/master: 6855036aa035913bc2bfb31c41576a49f42ecd5f
diff --git a/trunk/drivers/ide/ide-pnp.c b/trunk/drivers/ide/ide-pnp.c
@@ -73,3 +73,8 @@ void __init pnpide_init(void)
 {
 	pnp_register_driver(&idepnp_driver);
 }
+
+void __exit pnpide_exit(void)
+{
+	pnp_unregister_driver(&idepnp_driver);
+}
diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c
@@ -1782,6 +1782,7 @@ static int __init ide_setup(char *s)
 }
 
 extern void pnpide_init(void);
+extern void pnpide_exit(void);
 extern void h8300_ide_init(void);
 
 /*
@@ -2094,6 +2095,10 @@ void cleanup_module (void)
 	for (index = 0; index < MAX_HWIFS; ++index)
 		ide_unregister(index);
 
+#ifdef CONFIG_BLK_DEV_IDEPNP
+	pnpide_exit();
+#endif
+
 #ifdef CONFIG_PROC_FS
 	proc_ide_destroy();
 #endif