This change makes quirk_intel_ide_combined() dependent on the precise
conditions under which it is needed:

* IDE is built in
* IDE SATA option is not set
* ata_piix or ahci drivers are enabled

This fixes an issue where some modular configurations would not cause
the quirk to be enabled.
Signed-off-by: NJeff Garzik <jgarzik@pobox.com>
Signed-off-by: NLinus torvalds <torvalds@osdl.org>