diff --git a/[refs] b/[refs] index 0839b6768e17..f30f9cb8e3cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f04dbac2623439e8e15abf55742769af0280c919 +refs/heads/master: 65d8bac3df9516adb17ce9df94a955d3c2c85a51 diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig index 7d893a60f994..b4a8d6030e48 100644 --- a/trunk/drivers/ata/Kconfig +++ b/trunk/drivers/ata/Kconfig @@ -8,7 +8,6 @@ menuconfig ATA depends on BLOCK depends on !(M32R || M68K) || BROKEN depends on !SUN4 || BROKEN - depends on !(SPARC64 && !PCI) select SCSI ---help--- If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or