From owner-svn-src-all@FreeBSD.ORG  Sat Jan 16 07:55:46 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C693D1065679;
	Sat, 16 Jan 2010 07:55:46 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B4CDF8FC08;
	Sat, 16 Jan 2010 07:55:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0G7tkmW033289;
	Sat, 16 Jan 2010 07:55:46 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0G7tkUV033288;
	Sat, 16 Jan 2010 07:55:46 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201001160755.o0G7tkUV033288@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 16 Jan 2010 07:55:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202431 - stable/8/sys/dev/ahci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jan 2010 07:55:46 -0000

Author: mav
Date: Sat Jan 16 07:55:46 2010
New Revision: 202431
URL: http://svn.freebsd.org/changeset/base/202431

Log:
  Partially revert r202428. There is no bus_describe_intr() on RELENG_8.

Modified:
  stable/8/sys/dev/ahci/ahci.c

Modified: stable/8/sys/dev/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c	Sat Jan 16 04:34:03 2010	(r202430)
+++ stable/8/sys/dev/ahci/ahci.c	Sat Jan 16 07:55:46 2010	(r202431)
@@ -570,12 +570,6 @@ ahci_setup_interrupt(device_t dev)
 			device_printf(dev, "unable to setup interrupt\n");
 			return ENXIO;
 		}
-		if (ctlr->numirqs > 1) {
-			bus_describe_intr(dev, ctlr->irqs[i].r_irq,
-			    ctlr->irqs[i].handle,
-			    ctlr->irqs[i].mode == AHCI_IRQ_MODE_ONE ?
-			    "ch%d" : "%d", i);
-		}
 	}
 	return (0);
 }