From owner-svn-src-head@FreeBSD.ORG  Mon Dec  1 01:34:19 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12BAB1065672;
	Mon,  1 Dec 2008 01:34:19 +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 038948FC1A;
	Mon,  1 Dec 2008 01:34:19 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB11YIdg008111;
	Mon, 1 Dec 2008 01:34:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB11YI2B008110;
	Mon, 1 Dec 2008 01:34:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200812010134.mB11YI2B008110@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 1 Dec 2008 01:34:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185500 - head/sys/dev/ata
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Dec 2008 01:34:19 -0000

Author: mav
Date: Mon Dec  1 01:34:18 2008
New Revision: 185500
URL: http://svn.freebsd.org/changeset/base/185500

Log:
  Restore AHCI suspend/resume support,
  broken with modularization commit (rev 183724).

Modified:
  head/sys/dev/ata/ata-pci.h

Modified: head/sys/dev/ata/ata-pci.h
==============================================================================
--- head/sys/dev/ata/ata-pci.h	Mon Dec  1 00:45:51 2008	(r185499)
+++ head/sys/dev/ata/ata-pci.h	Mon Dec  1 01:34:18 2008	(r185500)
@@ -449,8 +449,8 @@ static device_method_t __CONCAT(dname,_m
     DEVMETHOD(device_probe,     __CONCAT(dname,_probe)), \
     DEVMETHOD(device_attach,    ata_pci_attach), \
     DEVMETHOD(device_detach,    ata_pci_detach), \
-    DEVMETHOD(device_suspend,   bus_generic_suspend), \
-    DEVMETHOD(device_resume,    bus_generic_resume), \
+    DEVMETHOD(device_suspend,   ata_pci_suspend), \
+    DEVMETHOD(device_resume,    ata_pci_resume), \
     DEVMETHOD(device_shutdown,  bus_generic_shutdown), \
     DEVMETHOD(bus_alloc_resource,       ata_pci_alloc_resource), \
     DEVMETHOD(bus_release_resource,     ata_pci_release_resource), \