---

yaml --- r: 4656 b: refs/heads/master c: ad2f931 h: refs/heads/master v: v3
git-mirror · Jul 11, 2005 · 44db34b · 44db34b
1 parent c3c127e
commit 44db34b
Show file tree

Hide file tree

Showing 10 changed files with 477 additions and 438 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e65f82814e9828d3ff54988de9e7c0b36794daa
+refs/heads/master: ad2f931dcb41bcfae38cc77d78b7821dfef83cf2
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -744,6 +744,8 @@ source "drivers/char/Kconfig"
 
 source "drivers/i2c/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 #source "drivers/l3/Kconfig"
 
 source "drivers/misc/Kconfig"

diff --git a/trunk/arch/h8300/Kconfig b/trunk/arch/h8300/Kconfig
@@ -179,6 +179,8 @@ source "drivers/serial/Kconfig"
 
 source "drivers/i2c/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "drivers/usb/Kconfig"
 
 endmenu

diff --git a/trunk/arch/sparc64/Kconfig b/trunk/arch/sparc64/Kconfig
@@ -647,6 +647,8 @@ source "drivers/input/Kconfig"
 
 source "drivers/i2c/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "fs/Kconfig"
 
 source "drivers/media/Kconfig"

diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
@@ -44,6 +44,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/w1/Kconfig"
 
+source "drivers/hwmon/Kconfig"
+
 source "drivers/misc/Kconfig"
 
 source "drivers/media/Kconfig"

diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_INPUT)		+= input/
 obj-$(CONFIG_I2O)		+= message/
 obj-$(CONFIG_I2C)		+= i2c/
 obj-$(CONFIG_W1)		+= w1/
+obj-$(CONFIG_HWMON)		+= hwmon/
 obj-$(CONFIG_PHONE)		+= telephony/
 obj-$(CONFIG_MD)		+= md/
 obj-$(CONFIG_BT)		+= bluetooth/
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,6 +179,8 @@ source "drivers/serial/Kconfig" @@
     source "drivers/i2c/Kconfig"
+    source "drivers/hwmon/Kconfig"
     source "drivers/usb/Kconfig"
     endmenu
@@ Expand Down @@