diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /drivers/Kconfig | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 3f8a231fe754..d74d9fbb9fd2 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig" | |||
| 52 | 52 | ||
| 53 | source "drivers/spi/Kconfig" | 53 | source "drivers/spi/Kconfig" |
| 54 | 54 | ||
| 55 | source "drivers/gpio/Kconfig" | ||
| 56 | |||
| 55 | source "drivers/w1/Kconfig" | 57 | source "drivers/w1/Kconfig" |
| 56 | 58 | ||
| 57 | source "drivers/power/Kconfig" | 59 | source "drivers/power/Kconfig" |