summaryrefslogtreecommitdiff
path: root/sys/dev/pci/amdpm.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2006-03-09 00:39:05 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2006-03-09 00:39:05 +0000
commit64b03cdb27285c46e13f00227fb10c19a50efb29 (patch)
tree8a7558a012f2c4047fb55d17d55fc911458ced82 /sys/dev/pci/amdpm.c
parent7b3c2366102ddf47b5058f0611ac4b2937a05cc9 (diff)
unbreak the tree. i dunno how this compiled on my box at home.
found by marco@
Diffstat (limited to 'sys/dev/pci/amdpm.c')
-rw-r--r--sys/dev/pci/amdpm.c22
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;