diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/Kconfig | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/Kconfig')
| -rw-r--r-- | drivers/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 48bbdbe43e69..a2b902f4d437 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | # drivers/Kconfig | ||
| 2 | |||
| 3 | menu "Device Drivers" | 1 | menu "Device Drivers" |
| 4 | 2 | ||
| 5 | source "drivers/base/Kconfig" | 3 | source "drivers/base/Kconfig" |
| @@ -30,7 +28,7 @@ source "drivers/md/Kconfig" | |||
| 30 | 28 | ||
| 31 | source "drivers/message/fusion/Kconfig" | 29 | source "drivers/message/fusion/Kconfig" |
| 32 | 30 | ||
| 33 | source "drivers/ieee1394/Kconfig" | 31 | source "drivers/firewire/Kconfig" |
| 34 | 32 | ||
| 35 | source "drivers/message/i2o/Kconfig" | 33 | source "drivers/message/i2o/Kconfig" |
| 36 | 34 | ||