The attached patch fixes two problems with 2.6.9-ac3: 1. restores the missing spin_unlock_irq() line, and 2. removes hwif from /proc/ide/ as part of __ide_unregister_hwif(). (and also removes a bogus compiler warning) Signed-off-by: Mark Lord -- Mark Lord (hdparm keeper & the original "Linux IDE Guy")