diff --git a/[refs] b/[refs]
index 9a523134b375..23bef724142d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4b5a4d91d6555df56489094cd5846cd03fc9239
+refs/heads/master: 2eae6ebbf99a083687466c010e3129fede9cdb4b
diff --git a/trunk/drivers/ide/ide-scan-pci.c b/trunk/drivers/ide/ide-scan-pci.c
index 7ffa332d77ce..93d2e41be853 100644
--- a/trunk/drivers/ide/ide-scan-pci.c
+++ b/trunk/drivers/ide/ide-scan-pci.c
@@ -81,7 +81,7 @@ static int __init ide_scan_pcidev(struct pci_dev *dev)
  *	module ordering not traditionally ordered.
  */
 
-int __init ide_scan_pcibus(void)
+static int __init ide_scan_pcibus(void)
 {
 	struct pci_dev *dev = NULL;
 	struct pci_driver *d;
@@ -113,9 +113,4 @@ int __init ide_scan_pcibus(void)
 	return 0;
 }
 
-static int __init ide_scan_pci(void)
-{
-	return ide_scan_pcibus();
-}
-
-module_init(ide_scan_pci);
+module_init(ide_scan_pcibus);
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index 27cb39de2ae2..c4d58b0e6509 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -1017,7 +1017,6 @@ void ide_init_disk(struct gendisk *, ide_drive_t *);
 
 #ifdef CONFIG_IDEPCI_PCIBUS_ORDER
 extern int ide_scan_direction;
-int __init ide_scan_pcibus(void);
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner, const char *mod_name);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE, KBUILD_MODNAME)
 #else