diff options
| author |   deraadt <deraadt@openbsd.org> | 2013-07-09 17:53:46 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2013-07-09 17:53:46 +0000 |
| commit | 76d3d10499eee2c4f31250d4f8439b7cd8602a32 (patch) | |
| tree | 3a5dc182a3eb82d9b7a6dfee16823c7eaf688efb | |
| parent | rename laddr2 to faddr2 for more consistency. OK markus@ (diff) | |
| download | wireguard-openbsd-76d3d10499eee2c4f31250d4f8439b7cd8602a32.tar.xz wireguard-openbsd-76d3d10499eee2c4f31250d4f8439b7cd8602a32.zip | |
pay attention to the #ifdef
| -rw-r--r-- | sys/dev/ic/ahci.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c index 69d52183931..c6524d50383 100644 --- a/sys/dev/ic/ahci.c +++ b/sys/dev/ic/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.2 2013/07/09 11:55:55 jmatthew Exp $ */ +/* $OpenBSD: ahci.c,v 1.3 2013/07/09 17:53:46 deraadt Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -30,20 +30,9 @@ #include <machine/bus.h> - #include <dev/ic/ahcivar.h> #include <dev/ic/ahcireg.h> -#ifdef HIBERNATE -#include <uvm/uvm.h> -#include <sys/hibernate.h> -#include <sys/disk.h> -#include <sys/disklabel.h> - -#include <scsi/scsi_all.h> -#include <scsi/scsiconf.h> - - #ifdef AHCI_DEBUG #define DPRINTF(m, f...) do { if ((ahcidebug & (m)) == (m)) printf(f); } \ while (0) @@ -56,6 +45,14 @@ int ahcidebug = AHCI_D_VERBOSE; #define DPRINTF(m, f...) #endif +#ifdef HIBERNATE +#include <uvm/uvm.h> +#include <sys/hibernate.h> +#include <sys/disk.h> +#include <sys/disklabel.h> + +#include <scsi/scsi_all.h> +#include <scsi/scsiconf.h> void ahci_hibernate_io_start(struct ahci_port *, struct ahci_ccb *); |