diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 02:31:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 02:31:27 +0200 |
commit | 0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch) | |
tree | 67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /drivers/scsi/Makefile | |
parent | Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airli... (diff) | |
parent | Merge by hand (conflicts in sd.c) (diff) | |
download | linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.xz linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/Makefile')
-rw-r--r-- | drivers/scsi/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index c662b8c8cc6d..4b4fd94c2674 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -22,6 +22,8 @@ subdir-$(CONFIG_PCMCIA) += pcmcia obj-$(CONFIG_SCSI) += scsi_mod.o +obj-$(CONFIG_RAID_ATTRS) += raid_class.o + # --- NOTE ORDERING HERE --- # For kernel non-modular link, transport attributes need to # be initialised before drivers |