diff options
| author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2007-03-04 13:32:42 +0000 |
|---|---|---|
| committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2007-03-04 13:32:42 +0000 |
| commit | 1ffd41c412ad73618d680477d452905e4756a5cf (patch) | |
| tree | ea223b656ecd28a2fea0f3b615cf4450d247556f /sys/dev | |
| parent | c21809e9d45dc2d913aad1c42323f3f25212a105 (diff) | |
Oops, remove duplicate prototypes that I mismerged.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/ahci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c index 5b56fa7a8fe..6919873f7c0 100644 --- a/sys/dev/pci/ahci.c +++ b/sys/dev/pci/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.55 2007/03/04 13:24:48 pascoe Exp $ */ +/* $OpenBSD: ahci.c,v 1.56 2007/03/04 13:32:41 pascoe Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -367,8 +367,6 @@ struct cfdriver ahci_cd = { NULL, "ahci", DV_DULL }; -int ahci_intr(void *); - int ahci_map_regs(struct ahci_softc *, struct pci_attach_args *); void ahci_unmap_regs(struct ahci_softc *, @@ -381,6 +379,8 @@ void ahci_unmap_intr(struct ahci_softc *, int ahci_port_alloc(struct ahci_softc *, u_int); void ahci_port_free(struct ahci_softc *, u_int); +int ahci_intr(void *); + struct ahci_ccb *ahci_get_ccb(struct ahci_port *); void ahci_put_ccb(struct ahci_port *, struct ahci_ccb *); @@ -397,8 +397,6 @@ int ahci_wait_ne(struct ahci_softc *, bus_size_t, u_int32_t ahci_pread(struct ahci_port *, bus_size_t); void ahci_pwrite(struct ahci_port *, bus_size_t, u_int32_t); -u_int32_t ahci_pread(struct ahci_port *, bus_size_t); -void ahci_pwrite(struct ahci_port *, bus_size_t, u_int32_t); int ahci_pwait_eq(struct ahci_port *, bus_size_t, u_int32_t, u_int32_t); int ahci_pwait_ne(struct ahci_port *, bus_size_t, |