svn commit: r208168 - head/sys/powerpc/powermac

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun May 16 20:31:31 2010
New Revision: 208168
URL: http://svn.freebsd.org/changeset/base/208168

Log:
  It is not necessary (and in some cases harmful) to hardcode ata_kauai's
  IRQ to 39 on K2 devices, as well as Shasta ones.
  
  Reported by:	Andreas Tobler

Modified:
  head/sys/powerpc/powermac/ata_kauai.c

Modified: head/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- head/sys/powerpc/powermac/ata_kauai.c	Sun May 16 19:57:38 2010	(r208167)
+++ head/sys/powerpc/powermac/ata_kauai.c	Sun May 16 20:31:31 2010	(r208168)
@@ -220,8 +220,9 @@ ata_kauai_probe(device_t dev)
 	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
 		sc->shasta = 1;
 
-	/* Regular Kauai controllers apparently need this hack */
-	if (!sc->shasta)
+	/* Pre-K2 controllers apparently need this hack */
+	if (!sc->shasta &&
+	    (compatstring == NULL || strcmp(compatstring, "K2-UATA") != 0))
 		bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1);
 
         rid = PCIR_BARS;