The patch titled
drivers/ide/: cleanups
has been added to the -mm tree. Its filename is
drivers-ide-cleanups.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drivers/ide/: cleanups
From: Adrian Bunk <bunk@xxxxxxxxx>
- setup-pci.c: #if 0 the unused ide_pci_unregister_driver()
- ide-dma.c: remove the unused EXPORT_SYMBOL_GPL(ide_in_drive_list)
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/ide-dma.c | 2 --
drivers/ide/setup-pci.c | 4 +++-
include/linux/ide.h | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff -puN drivers/ide/ide-dma.c~drivers-ide-cleanups drivers/ide/ide-dma.c
--- a/drivers/ide/ide-dma.c~drivers-ide-cleanups
+++ a/drivers/ide/ide-dma.c
@@ -151,8 +151,6 @@ int ide_in_drive_list(struct hd_driveid
return 0;
}
-EXPORT_SYMBOL_GPL(ide_in_drive_list);
-
/**
* ide_dma_intr - IDE DMA interrupt handler
* @drive: the drive the interrupt is for
diff -puN drivers/ide/setup-pci.c~drivers-ide-cleanups drivers/ide/setup-pci.c
--- a/drivers/ide/setup-pci.c~drivers-ide-cleanups
+++ a/drivers/ide/setup-pci.c
@@ -801,7 +801,8 @@ EXPORT_SYMBOL_GPL(__ide_pci_register_dri
* Unregister a currently installed IDE driver. Returns are the same
* as for pci_unregister_driver
*/
-
+
+#if 0
void ide_pci_unregister_driver(struct pci_driver *driver)
{
if(!pre_init)
@@ -811,6 +812,7 @@ void ide_pci_unregister_driver(struct pc
}
EXPORT_SYMBOL_GPL(ide_pci_unregister_driver);
+#endif /* 0 */
/**
* ide_scan_pcidev - find an IDE driver for a device
diff -puN include/linux/ide.h~drivers-ide-cleanups include/linux/ide.h
--- a/include/linux/ide.h~drivers-ide-cleanups
+++ a/include/linux/ide.h
@@ -1192,7 +1192,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);
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-alsa.patch
make-sound-isa-gus-gusextremecdevices-static.patch
arch-arm-kernel-bios32c-no-need-to-set-isa_bridge.patch
git-cpufreq.patch
git-gfs2.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
git-mtd.patch
drivers-net-e1000-possible-cleanups.patch
fs-nfs-make-2-functions-static.patch
fs-nfs-make-code-static.patch
git-pcmcia.patch
include-scsi-libsash-should-include-linux-scatterlisth.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
git-scsi-rc-fixes.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
drivers-scsi-arcmsr-cleanups.patch
areca-raid-linux-scsi-driver-update7-fix-2.patch
mm-make-functions-static.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch
reiserfs-warn-about-the-useless-nolargeio-option.patch
x86-microcode-add-sysfs-and-hotplug-support-fix-fix-2.patch
null-terminate-over-long-proc-kallsyms-symbols-fix.patch
remove-kernel-kthreadckthread_stop_sem.patch
drivers-block-cpqarrayc-remove-an-unused-variable.patch
task-watchers-register-semundo-task-watcher.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-add-a-maintainers-entry.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-sysctl-hack-fix.patch
namespaces-utsname-implement-clone_newuts-flag.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-cleanups.patch
srcu-3-add-srcu-operations-to-rcutorture-fix.patch
the-scheduled-removal-of-some-oss-drivers.patch
the-scheduled-removal-of-some-oss-drivers-fix.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-sound-oss-_symsc.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
