diff --git a/[refs] b/[refs]
index 288c290644d1..d401b4cd9390 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaba6d4bf6f2a52a0c30ad1da4374ba24bd7163b
+refs/heads/master: eb7972271720bfc64dc8bacc5b15f874c0bcc859
diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c
index 3b334af0c7b9..6c9bd5165bdb 100644
--- a/trunk/drivers/ide/ide.c
+++ b/trunk/drivers/ide/ide.c
@@ -1781,9 +1781,9 @@ static int __init ide_setup(char *s)
 	return 1;
 }
 
-extern void pnpide_init(void);
-extern void pnpide_exit(void);
-extern void h8300_ide_init(void);
+extern void __init pnpide_init(void);
+extern void __exit pnpide_exit(void);
+extern void __init h8300_ide_init(void);
 
 /*
  * probe_for_hwifs() finds/initializes "known" IDE interfaces
@@ -2088,7 +2088,7 @@ int __init init_module (void)
 	return ide_init();
 }
 
-void cleanup_module (void)
+void __exit cleanup_module (void)
 {
 	int index;