summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-11-15 16:19:16 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-11-15 16:19:16 +0000
commitc8c7014162f692ead770cea7fb5b67b92fd04f97 (patch)
tree76705b8e1b55ca9e49774a15cfeb7268c60c0114 /sys
parentdb530a74abd93506dd1163607159106f3853f118 (diff)
move lm87 to dev/i2c; ok kettenis
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/conf/files.macppc6
-rw-r--r--sys/dev/i2c/files.i2c7
-rw-r--r--sys/dev/i2c/lm87.c (renamed from sys/arch/macppc/dev/lm87.c)2
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index f1f5362c679..3a6393c7d46 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.36 2005/11/14 21:54:38 kettenis Exp $
+# $OpenBSD: files.macppc,v 1.37 2005/11/15 16:19:15 deraadt Exp $
#
# macppc-specific configuration info
@@ -270,10 +270,6 @@ device maciic {} : i2c
attach maciic at ki2c, smu
file arch/macppc/dev/maci2c.c maciic
-device lmenv
-attach lmenv at maciic
-file arch/macppc/dev/lm87.c lmenv
-
# Sun HME Ethernet controllers
device hme: ether, ifnet, mii, ifmedia
file dev/ic/hme.c
diff --git a/sys/dev/i2c/files.i2c b/sys/dev/i2c/files.i2c
index 525810c1c2e..694dc4a3862 100644
--- a/sys/dev/i2c/files.i2c
+++ b/sys/dev/i2c/files.i2c
@@ -1,4 +1,4 @@
-# $OpenBSD: files.i2c,v 1.6 2005/11/12 22:59:06 kettenis Exp $
+# $OpenBSD: files.i2c,v 1.7 2005/11/15 16:19:15 deraadt Exp $
# $NetBSD: files.i2c,v 1.3 2003/10/20 16:24:10 briggs Exp $
define i2c {[addr = -1], [size = -1]}
@@ -18,3 +18,8 @@ file dev/i2c/i2c_bitbang.c i2c_bitbang
device lmtemp
attach lmtemp at i2c
file dev/i2c/lm75.c lmtemp
+
+# National Semiconductor LM87 sensor
+device lmenv
+attach lmenv at i2c
+file dev/i2c/lm87.c lmenv
diff --git a/sys/arch/macppc/dev/lm87.c b/sys/dev/i2c/lm87.c
index 458f74cdc2d..30130ef1297 100644
--- a/sys/arch/macppc/dev/lm87.c
+++ b/sys/dev/i2c/lm87.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lm87.c,v 1.2 2005/11/14 22:22:32 deraadt Exp $ */
+/* $OpenBSD: lm87.c,v 1.1 2005/11/15 16:19:15 deraadt Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis