diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-03-15 17:02:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-03-15 17:02:08 -0500 |
| commit | dd288e7d75b9041f79fecae77d61cfa345da7266 (patch) | |
| tree | 85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd /arch/arm/Kconfig | |
| parent | 30dcbf29cc6d92d70fa262e79e84011fe6913bed (diff) | |
| parent | 72df16f109b73be37977a26d342e9103e8851cb6 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f80fa502f8f..32ba00bd0a2f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -799,6 +799,8 @@ source "drivers/i2c/Kconfig" | |||
| 799 | 799 | ||
| 800 | source "drivers/spi/Kconfig" | 800 | source "drivers/spi/Kconfig" |
| 801 | 801 | ||
| 802 | source "drivers/w1/Kconfig" | ||
| 803 | |||
| 802 | source "drivers/hwmon/Kconfig" | 804 | source "drivers/hwmon/Kconfig" |
| 803 | 805 | ||
| 804 | #source "drivers/l3/Kconfig" | 806 | #source "drivers/l3/Kconfig" |