aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 18:54:36 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 18:54:36 -0400
commit22a4427972af371fddb49c0184a93851ad51070d (patch)
tree2d513301698bc8c5b691caf7268a57f296fdf69d /arch/arm
parent9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff)
parentede7fbdf526c314850c9f32dd8da1753bf8d0ad5 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 45462714caf1..7bc4a583f4e1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -746,6 +746,8 @@ source "drivers/char/Kconfig"
746 746
747source "drivers/i2c/Kconfig" 747source "drivers/i2c/Kconfig"
748 748
749source "drivers/hwmon/Kconfig"
750
749#source "drivers/l3/Kconfig" 751#source "drivers/l3/Kconfig"
750 752
751source "drivers/misc/Kconfig" 753source "drivers/misc/Kconfig"