Merge kanga.twiddle.net:/home/rth/work/linux/linus-2.5

into kanga.twiddle.net:/home/rth/work/linux/axp-2.5

include/asm-alpha/ide.h

@@ -75,7 +75,7 @@ static __inline__ void ide_init_default_hwifs(void)
 	for (index = 0; index < MAX_HWIFS; index++) {
 		ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, NULL);
 		hw.irq = ide_default_irq(ide_default_io_base(index));
-		ide_register_hw(&hw);
+		ide_register_hw(&hw, NULL);
 	}
 #endif
 }