diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/scsi/Makefile | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/scsi/Makefile')
| -rw-r--r-- | drivers/scsi/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 1e4edbdf2730..48529d180ca8 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
| @@ -99,6 +99,7 @@ obj-$(CONFIG_SCSI_DC395x) += dc395x.o | |||
| 99 | obj-$(CONFIG_SCSI_DC390T) += tmscsim.o | 99 | obj-$(CONFIG_SCSI_DC390T) += tmscsim.o |
| 100 | obj-$(CONFIG_MEGARAID_LEGACY) += megaraid.o | 100 | obj-$(CONFIG_MEGARAID_LEGACY) += megaraid.o |
| 101 | obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/ | 101 | obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/ |
| 102 | obj-$(CONFIG_MEGARAID_SAS) += megaraid/ | ||
| 102 | obj-$(CONFIG_SCSI_ACARD) += atp870u.o | 103 | obj-$(CONFIG_SCSI_ACARD) += atp870u.o |
| 103 | obj-$(CONFIG_SCSI_SUNESP) += esp.o | 104 | obj-$(CONFIG_SCSI_SUNESP) += esp.o |
| 104 | obj-$(CONFIG_SCSI_GDTH) += gdth.o | 105 | obj-$(CONFIG_SCSI_GDTH) += gdth.o |