diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:43:49 -0400 |
| commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
| tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /drivers/scsi/Makefile | |
| parent | 739cdbf1d8f0739b80035b80d69d871e33749b86 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 64aaab64aeb6..370a560c6aef 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
| @@ -22,6 +22,8 @@ subdir-$(CONFIG_PCMCIA) += pcmcia | |||
| 22 | 22 | ||
| 23 | obj-$(CONFIG_SCSI) += scsi_mod.o | 23 | obj-$(CONFIG_SCSI) += scsi_mod.o |
| 24 | 24 | ||
| 25 | obj-$(CONFIG_RAID_ATTRS) += raid_class.o | ||
| 26 | |||
| 25 | # --- NOTE ORDERING HERE --- | 27 | # --- NOTE ORDERING HERE --- |
| 26 | # For kernel non-modular link, transport attributes need to | 28 | # For kernel non-modular link, transport attributes need to |
| 27 | # be initialised before drivers | 29 | # be initialised before drivers |
| @@ -133,6 +135,7 @@ obj-$(CONFIG_SCSI_SATA_SIS) += libata.o sata_sis.o | |||
| 133 | obj-$(CONFIG_SCSI_SATA_SX4) += libata.o sata_sx4.o | 135 | obj-$(CONFIG_SCSI_SATA_SX4) += libata.o sata_sx4.o |
| 134 | obj-$(CONFIG_SCSI_SATA_NV) += libata.o sata_nv.o | 136 | obj-$(CONFIG_SCSI_SATA_NV) += libata.o sata_nv.o |
| 135 | obj-$(CONFIG_SCSI_SATA_ULI) += libata.o sata_uli.o | 137 | obj-$(CONFIG_SCSI_SATA_ULI) += libata.o sata_uli.o |
| 138 | obj-$(CONFIG_SCSI_SATA_MV) += libata.o sata_mv.o | ||
| 136 | 139 | ||
| 137 | obj-$(CONFIG_ARM) += arm/ | 140 | obj-$(CONFIG_ARM) += arm/ |
| 138 | 141 | ||