> Don't panic. It looks like it's something else in linux-next that's > changing some ifdef's in the media-bay code which is causing that. > > I managed to pull linux next at the merge point with your tree and > things apply. I'll use that to test. Ok, it doesn't work properly. It gets error trying to register the IDE device. Booting with a CD drive in and no disk in the drive gives the log below. I've verified that it works without your patches. If I apply only patch 1, it doesn't build due to some wrong construct in the probe code. I've hand fixed it, but then I hit a BUG_ON in ide_probe_port() (line 773). mediabay boot time messages (before IDE probing) are: mediabay0: Registered Heathrow media-bay mediabay0: powering down mediabay0: switching to 3 mediabay0: powering up mediabay0: enabling (kind:3) mediabay0: waiting reset (kind:3) mediabay0: waiting IDE reset (kind:3) mediabay0: waiting IDE ready (kind:3) mediabay0: up before IDE init mediabay1: Registered Heathrow media-bay mediabay1: powering down mediabay1: switching to 0 mediabay1: powering up mediabay1: enabling (kind:0) mediabay1: waiting reset (kind:0) mediabay1: bay is up (kind:0) Later, IDE registers: (ide0 is another controller, only ide1 and ide2 are media bay based, and ide2 has no device on it at all). ide-pmac: Found Apple Heathrow ATA controller (macio), bus ID 1 (mediabay), irq 35 ide1 at 0xc7020000-0xc7020070,0xc7020160 on irq 35 ide-pmac: Found Apple Heathrow ATA controller (macio), bus ID 4 (mediabay), irq 67 ide2 at 0xc7022000-0xc7022070,0xc7022160 on irq 67 mediabay0: waiting IDE ready (kind:3) mediabay 0, registering IDE... IDE register error mediabay0: powering down .../... mediabay0: end of power down mediabay0: switching to 3 mediabay0: powering up mediabay0: enabling (kind:3) mediabay0: waiting reset (kind:3) mediabay0: waiting IDE reset (kind:3) .../... mediabay0: waiting IDE ready (kind:3) mediabay 0, registering IDE... IDE register error mediabay0: powering down mediabay0: end of power down mediabay0: switching to 3 mediabay0: powering up mediabay0: enabling (kind:3) mediabay0: waiting reset (kind:3) mediabay0: waiting IDE reset (kind:3) mediabay0: waiting IDE ready (kind:3) mediabay 0, registering IDE... IDE register error mediabay0: powering down mediabay0: end of power down mediabay0: switching to 3 mediabay0: powering up mediabay0: enabling (kind:3) mediabay0: waiting reset (kind:3) mediabay0: waiting IDE reset (kind:3) mediabay0: waiting IDE ready (kind:3) mediabay 0, registering IDE... IDE register error mediabay0: powering down media-bay 0, IDE device badly inserted or unrecognised mediabay0: end of power down Cheers, Ben. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html