aboutsummaryrefslogtreecommitdiffstats
path: root/arch/h8300/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 /arch/h8300/Kconfig
parent9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff)
parentede7fbdf526c314850c9f32dd8da1753bf8d0ad5 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'arch/h8300/Kconfig')
-rw-r--r--arch/h8300/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 375f2a8ff3b5..26698a49f153 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -181,6 +181,8 @@ source "drivers/serial/Kconfig"
181 181
182source "drivers/i2c/Kconfig" 182source "drivers/i2c/Kconfig"
183 183
184source "drivers/hwmon/Kconfig"
185
184source "drivers/usb/Kconfig" 186source "drivers/usb/Kconfig"
185 187
186endmenu 188endmenu