Update of /cvsroot/linux-mips/linux/drivers/ide
In directory usw-pr-cvs1:/tmp/cvs-serv17983/drivers/ide
Modified Files:
ide.c
Log Message:
Synced to 2.4.18
Index: ide.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/ide/ide.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ide.c 28 Jan 2002 20:48:47 -0000 1.1
+++ ide.c 26 Feb 2002 19:03:29 -0000 1.2
@@ -1367,7 +1367,10 @@
* the driver. This makes the driver much more friendlier to shared IRQs
* than previous designs, while remaining 100% (?) SMP safe and capable.
*/
-static void ide_do_request(ide_hwgroup_t *hwgroup, int masked_irq)
+/* --BenH: made non-static as ide-pmac.c uses it to kick the hwgroup back
+ * into life on wakeup from machine sleep.
+ */
+void ide_do_request(ide_hwgroup_t *hwgroup, int masked_irq)
{
ide_drive_t *drive;
ide_hwif_t *hwif;
@@ -1884,7 +1887,6 @@
if (drive->part[p].nr_sects > 0) {
kdev_t devp = MKDEV(major, minor+p);
invalidate_device(devp, 1);
- set_blocksize(devp, 1024);
}
drive->part[p].start_sect = 0;
drive->part[p].nr_sects = 0;
|
