Merge branch 'from-linus'

[linux-2.6] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 274d152871813dca9d6a714e92f1c8c8afba1749..a7fc4cc79b235f5ffefae57b99c2668d1ed3397a 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1005,7 +1005,6 @@ extern    ide_hwif_t      ide_hwifs[];            /* master data repository */
 extern int noautodma;
 
 extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
-extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs);
 
 /*
  * This is used on exit from the driver to designate the next irq handler