diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-22 07:48:51 -0500 |
| commit | f11cbd74c5ff3614f6390b4de67a6ffdc614c378 (patch) | |
| tree | 6a30920ade9eeaac5bf6d6263b5d09712e882eb0 /drivers/Kconfig | |
| parent | 429c42c9d246f5bda868495c09974312a0177328 (diff) | |
| parent | aea187c46f7d03ce985e55eb1398d0776a15b928 (diff) | |
Merge branch 'master' into for-2.6.34
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 8a07363417ed..368ae6d3a096 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -28,7 +28,7 @@ source "drivers/md/Kconfig" | |||
| 28 | 28 | ||
| 29 | source "drivers/message/fusion/Kconfig" | 29 | source "drivers/message/fusion/Kconfig" |
| 30 | 30 | ||
| 31 | source "drivers/ieee1394/Kconfig" | 31 | source "drivers/firewire/Kconfig" |
| 32 | 32 | ||
| 33 | source "drivers/message/i2o/Kconfig" | 33 | source "drivers/message/i2o/Kconfig" |
| 34 | 34 | ||