aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Makefile
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-31 00:57:05 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-31 00:57:05 -0400
commit5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch)
tree8291998abd73055de6f487fafa174ee2a5d3afee /drivers/scsi/Makefile
parent6edae708bf77e012d855a7e2c7766f211d234f4f (diff)
parent3f0a6766e0cc5a577805732e5adb50a585c58175 (diff)
[SCSI] Merge up to linux-2.6 head
Conflicts: drivers/scsi/jazz_esp.c Same changes made by both SCSI and SPARC trees: problem with UTF-8 conversion in the copyright. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/Makefile')
-rw-r--r--drivers/scsi/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 51cba91cd228..cba39679f947 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -103,8 +103,7 @@ obj-$(CONFIG_MEGARAID_LEGACY) += megaraid.o
103obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/ 103obj-$(CONFIG_MEGARAID_NEWGEN) += megaraid/
104obj-$(CONFIG_MEGARAID_SAS) += megaraid/ 104obj-$(CONFIG_MEGARAID_SAS) += megaraid/
105obj-$(CONFIG_SCSI_ACARD) += atp870u.o 105obj-$(CONFIG_SCSI_ACARD) += atp870u.o
106obj-$(CONFIG_SCSI_ESP_CORE) += esp_scsi.o 106obj-$(CONFIG_SCSI_SUNESP) += esp_scsi.o sun_esp.o
107obj-$(CONFIG_SCSI_SUNESP) += sun_esp.o
108obj-$(CONFIG_SCSI_GDTH) += gdth.o 107obj-$(CONFIG_SCSI_GDTH) += gdth.o
109obj-$(CONFIG_SCSI_INITIO) += initio.o 108obj-$(CONFIG_SCSI_INITIO) += initio.o
110obj-$(CONFIG_SCSI_INIA100) += a100u2w.o 109obj-$(CONFIG_SCSI_INIA100) += a100u2w.o