aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 15:54:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 15:54:36 -0700
commit22a4427972af371fddb49c0184a93851ad51070d (patch)
tree2d513301698bc8c5b691caf7268a57f296fdf69d /arch/sparc64
parent9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff)
parentede7fbdf526c314850c9f32dd8da1753bf8d0ad5 (diff)
downloadkernel_samsung_smdk4412-22a4427972af371fddb49c0184a93851ad51070d.zip
kernel_samsung_smdk4412-22a4427972af371fddb49c0184a93851ad51070d.tar.gz
kernel_samsung_smdk4412-22a4427972af371fddb49c0184a93851ad51070d.tar.bz2
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 1406078..9afd28e 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -649,6 +649,8 @@ source "drivers/input/Kconfig"
source "drivers/i2c/Kconfig"
+source "drivers/hwmon/Kconfig"
+
source "fs/Kconfig"
source "drivers/media/Kconfig"