diff options
| author |   dlg <dlg@openbsd.org> | 2006-03-09 00:39:04 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2006-03-09 00:39:04 +0000 |
| commit | f80bdd3b253c6dadc369d53ac62b52569e28b16c (patch) | |
| tree | 910c6160931d190f89178ce29d4d41d53524b7b4 /sys | |
| parent | amdpmreg.h is only used by amdpm.c, so merge the header into the c file. (diff) | |
| download | wireguard-openbsd-f80bdd3b253c6dadc369d53ac62b52569e28b16c.tar.xz wireguard-openbsd-f80bdd3b253c6dadc369d53ac62b52569e28b16c.zip | |
unbreak the tree. i dunno how this compiled on my box at home.
found by marco@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/amdpm.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c index a1263748efd..dfb417ae44e 100644 --- a/sys/dev/pci/amdpm.c +++ b/sys/dev/pci/amdpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpm.c,v 1.16 2006/03/08 22:59:14 dlg Exp $ */ +/* $OpenBSD: amdpm.c,v 1.17 2006/03/09 00:39:04 dlg Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -69,8 +69,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <dev/pci/amdpmreg.h> - #include <dev/rndvar.h> #include <dev/i2c/i2cvar.h> @@ -90,6 +88,15 @@ u_int amdpm_get_timecount(struct timecounter *tc); #define AMDPM_FREQUENCY 3579545 #endif +static struct timecounter amdpm_timecounter = { + amdpm_get_timecount, /* get_timecount */ + 0, /* no poll_pps */ + 0xffffff, /* counter_mask */ + AMDPM_FREQUENCY, /* frequency */ + "AMDPM", /* name */ + 1000 /* quality */ +}; +#endif #define AMDPM_CONFREG 0x40 @@ -152,15 +159,6 @@ u_int amdpm_get_timecount(struct timecounter *tc); #define AMDPM_SMBDATA 0x6 /* SMBus data */ #define AMDPM_SMBCMD 0x8 /* SMBus command */ -static struct timecounter amdpm_timecounter = { - amdpm_get_timecount, /* get_timecount */ - 0, /* no poll_pps */ - 0xffffff, /* counter_mask */ - AMDPM_FREQUENCY, /* frequency */ - "AMDPM", /* name */ - 1000 /* quality */ -}; -#endif struct amdpm_softc { struct device sc_dev; |