diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 16:29:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 16:29:49 -0800 |
| commit | 38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5 (patch) | |
| tree | 1101e3df845ce804035335f80ef3467397bd5373 /drivers/Makefile | |
| parent | de23be5f3580f7b9b52cad6633bb3a3cd13abafe (diff) | |
| parent | c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 (diff) | |
| download | talos-op-linux-38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5.tar.gz talos-op-linux-38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5.zip | |
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/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index ef5132469f58..7eb35f479461 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -46,6 +46,7 @@ obj-y += macintosh/ obj-$(CONFIG_IDE) += ide/ obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_ATA) += ata/ +obj-$(CONFIG_TARGET_CORE) += target/ obj-$(CONFIG_MTD) += mtd/ obj-$(CONFIG_SPI) += spi/ obj-y += net/ |
