From 65e980241a81d7e59113be71c43a94d77e11670d Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 3 Oct 2006 01:14:24 -0700
Subject: [PATCH] --- yaml --- r: 38033 b: refs/heads/master c:
 27ac6036f31dea8117ecc525e0dbfd17b23e8c09 h: refs/heads/master i:   38031:
 9faa5f8484c507d6d21f5bb895ca4ff8cf49aa1e v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/ide/ide-dma.c   |  2 --
 trunk/drivers/ide/setup-pci.c | 18 ------------------
 trunk/include/linux/ide.h     |  1 -
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 70fbb90af534..1e96f2c3b20a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349ae23fe7379a42973bcb1c85f7d43ec583c17d
+refs/heads/master: 27ac6036f31dea8117ecc525e0dbfd17b23e8c09
diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c
index 53feaf82576e..9069766f236e 100644
--- a/trunk/drivers/ide/ide-dma.c
+++ b/trunk/drivers/ide/ide-dma.c
@@ -151,8 +151,6 @@ int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *driv
 	return 0;
 }
 
-EXPORT_SYMBOL_GPL(ide_in_drive_list);
-
 /**
  *	ide_dma_intr	-	IDE DMA interrupt handler
  *	@drive: the drive the interrupt is for
diff --git a/trunk/drivers/ide/setup-pci.c b/trunk/drivers/ide/setup-pci.c
index 157fe93ea342..0719b6484824 100644
--- a/trunk/drivers/ide/setup-pci.c
+++ b/trunk/drivers/ide/setup-pci.c
@@ -794,24 +794,6 @@ int __ide_pci_register_driver(struct pci_driver *driver, struct module *module)
 
 EXPORT_SYMBOL_GPL(__ide_pci_register_driver);
 
-/**
- *	ide_unregister_pci_driver	-	unregister an IDE driver
- *	@driver: driver to remove
- *
- *	Unregister a currently installed IDE driver. Returns are the same
- *	as for pci_unregister_driver
- */
- 
-void ide_pci_unregister_driver(struct pci_driver *driver)
-{
-	if(!pre_init)
-		pci_unregister_driver(driver);
-	else
-		list_del(&driver->node);
-}
-
-EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
-
 /**
  *	ide_scan_pcidev		-	find an IDE driver for a device
  *	@dev: PCI device to check
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index bdb2733208c5..097d16e5ab37 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -1193,7 +1193,6 @@ extern int ideprobe_init(void);
 extern void ide_scan_pcibus(int scan_direction) __init;
 extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *owner);
 #define ide_pci_register_driver(d) __ide_pci_register_driver(d, THIS_MODULE)
-extern void ide_pci_unregister_driver(struct pci_driver *driver);
 void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *);
 extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);