diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 13:43:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 13:43:26 -0500 |
| commit | 61b7efddc5256225099d13185659e9ad9d8abc8a (patch) | |
| tree | 7cbfec9c0012b07c7a236a953f5e067304725415 /arch | |
| parent | 3e2b32b69308e974cd1167beaf266d3c716e4734 (diff) | |
| parent | 2e10c84b9cf0b2d269c5629048d8d6e35eaf6b2b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6
Diffstat (limited to 'arch')
| -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 50b9afa8ae6d..3cfd82a05b20 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -729,6 +729,8 @@ source "drivers/char/Kconfig" | |||
| 729 | 729 | ||
| 730 | source "drivers/i2c/Kconfig" | 730 | source "drivers/i2c/Kconfig" |
| 731 | 731 | ||
| 732 | source "drivers/spi/Kconfig" | ||
| 733 | |||
| 732 | source "drivers/hwmon/Kconfig" | 734 | source "drivers/hwmon/Kconfig" |
| 733 | 735 | ||
| 734 | #source "drivers/l3/Kconfig" | 736 | #source "drivers/l3/Kconfig" |