diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 18:54:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 18:54:36 -0400 |
| commit | 22a4427972af371fddb49c0184a93851ad51070d (patch) | |
| tree | 2d513301698bc8c5b691caf7268a57f296fdf69d /arch | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | ede7fbdf526c314850c9f32dd8da1753bf8d0ad5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/h8300/Kconfig | 2 | ||||
| -rw-r--r-- | arch/sparc64/Kconfig | 2 |
3 files changed, 6 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 | ||
| 747 | source "drivers/i2c/Kconfig" | 747 | source "drivers/i2c/Kconfig" |
| 748 | 748 | ||
| 749 | source "drivers/hwmon/Kconfig" | ||
| 750 | |||
| 749 | #source "drivers/l3/Kconfig" | 751 | #source "drivers/l3/Kconfig" |
| 750 | 752 | ||
| 751 | source "drivers/misc/Kconfig" | 753 | source "drivers/misc/Kconfig" |
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 | ||
| 182 | source "drivers/i2c/Kconfig" | 182 | source "drivers/i2c/Kconfig" |
| 183 | 183 | ||
| 184 | source "drivers/hwmon/Kconfig" | ||
| 185 | |||
| 184 | source "drivers/usb/Kconfig" | 186 | source "drivers/usb/Kconfig" |
| 185 | 187 | ||
| 186 | endmenu | 188 | endmenu |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 140607870f13..9afd28e2c4d5 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
| @@ -649,6 +649,8 @@ source "drivers/input/Kconfig" | |||
| 649 | 649 | ||
| 650 | source "drivers/i2c/Kconfig" | 650 | source "drivers/i2c/Kconfig" |
| 651 | 651 | ||
| 652 | source "drivers/hwmon/Kconfig" | ||
| 653 | |||
| 652 | source "fs/Kconfig" | 654 | source "fs/Kconfig" |
| 653 | 655 | ||
| 654 | source "drivers/media/Kconfig" | 656 | source "drivers/media/Kconfig" |