diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 13:06:44 -0500 |
commit | 0bd2af46839ad6262d25714a6ec0365db9d6b98f (patch) | |
tree | dcced72d230d69fd0c5816ac6dd03ab84799a93e /drivers/Kconfig | |
parent | e138a5d2356729b8752e88520cc1525fae9794ac (diff) | |
parent | f26b90440cd74c78fe10c9bd5160809704a9627c (diff) |
Merge ../scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r-- | drivers/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 263e86ddc1a4..f39463418904 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -14,6 +14,10 @@ source "drivers/pnp/Kconfig" | |||
14 | 14 | ||
15 | source "drivers/block/Kconfig" | 15 | source "drivers/block/Kconfig" |
16 | 16 | ||
17 | # misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4 | ||
18 | |||
19 | source "drivers/misc/Kconfig" | ||
20 | |||
17 | source "drivers/ide/Kconfig" | 21 | source "drivers/ide/Kconfig" |
18 | 22 | ||
19 | source "drivers/scsi/Kconfig" | 23 | source "drivers/scsi/Kconfig" |
@@ -52,8 +56,6 @@ source "drivers/w1/Kconfig" | |||
52 | 56 | ||
53 | source "drivers/hwmon/Kconfig" | 57 | source "drivers/hwmon/Kconfig" |
54 | 58 | ||
55 | source "drivers/misc/Kconfig" | ||
56 | |||
57 | source "drivers/mfd/Kconfig" | 59 | source "drivers/mfd/Kconfig" |
58 | 60 | ||
59 | source "drivers/media/Kconfig" | 61 | source "drivers/media/Kconfig" |