diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 19:29:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 19:29:49 -0500 |
| commit | 38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5 (patch) | |
| tree | 1101e3df845ce804035335f80ef3467397bd5373 /drivers/Kconfig | |
| parent | de23be5f3580f7b9b52cad6633bb3a3cd13abafe (diff) | |
| parent | c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6:
[SCSI] target: Add LIO target core v4.0.0-rc6
[SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event
[SCSI] sd: implement sd_check_events()
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 dd0a5b5e9bf3..9bfb71ff3a6a 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -26,6 +26,8 @@ source "drivers/ata/Kconfig" | |||
| 26 | 26 | ||
| 27 | source "drivers/md/Kconfig" | 27 | source "drivers/md/Kconfig" |
| 28 | 28 | ||
| 29 | source "drivers/target/Kconfig" | ||
| 30 | |||
| 29 | source "drivers/message/fusion/Kconfig" | 31 | source "drivers/message/fusion/Kconfig" |
| 30 | 32 | ||
| 31 | source "drivers/firewire/Kconfig" | 33 | source "drivers/firewire/Kconfig" |