diff options
| author |   jmatthew <jmatthew@openbsd.org> | 2017-05-27 14:16:45 +0000 |
|---|---|---|
| committer | jmatthew <jmatthew@openbsd.org> | 2017-05-27 14:16:45 +0000 |
| commit | f531389dc53b498f71e6e3ee43c95fec6335f443 (patch) | |
| tree | c7be68a22202eae80b1bff263c0859ab4fbc7d2c | |
| parent | Add an ALRM timer to cope with 2 annoying issues in rc.d(8): (diff) | |
| download | wireguard-openbsd-f531389dc53b498f71e6e3ee43c95fec6335f443.tar.xz wireguard-openbsd-f531389dc53b498f71e6e3ee43c95fec6335f443.zip | |
remove #ifdef HIBERNATE section that declares stuff that lives in ahci.c
| -rw-r--r-- | sys/dev/pci/ahci_pci.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/dev/pci/ahci_pci.c b/sys/dev/pci/ahci_pci.c index 0ab21607fee..36bf3098481 100644 --- a/sys/dev/pci/ahci_pci.c +++ b/sys/dev/pci/ahci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci_pci.c,v 1.12 2016/01/14 04:06:53 dlg Exp $ */ +/* $OpenBSD: ahci_pci.c,v 1.13 2017/05/27 14:16:45 jmatthew Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -163,24 +163,6 @@ void ahci_pci_attach(struct device *, struct device *, int ahci_pci_detach(struct device *, int); int ahci_pci_activate(struct device *, int); -#ifdef HIBERNATE -#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 *); -int ahci_hibernate_io_poll(struct ahci_port *, - struct ahci_ccb *); -void ahci_hibernate_load_prdt(struct ahci_ccb *); - -int ahci_hibernate_io(dev_t dev, daddr_t blkno, - vaddr_t addr, size_t size, int wr, void *page); -#endif - struct cfattach ahci_pci_ca = { sizeof(struct ahci_pci_softc), ahci_pci_match, |