aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/Kconfig
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 /drivers/Kconfig
parent9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff)
parentede7fbdf526c314850c9f32dd8da1753bf8d0ad5 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r--drivers/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 34efb2150e68..cecab0acc3fe 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -44,6 +44,8 @@ source "drivers/i2c/Kconfig"
44 44
45source "drivers/w1/Kconfig" 45source "drivers/w1/Kconfig"
46 46
47source "drivers/hwmon/Kconfig"
48
47source "drivers/misc/Kconfig" 49source "drivers/misc/Kconfig"
48 50
49source "drivers/media/Kconfig" 51source "drivers/media/Kconfig"