Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6

[safe/jmp/linux-2.6] / drivers / s390 / scsi / Makefile

diff --git a/drivers/s390/scsi/Makefile b/drivers/s390/scsi/Makefile
index 1aa4650..cb301cc 100644 (file)
--- a/drivers/s390/scsi/Makefile
+++ b/drivers/s390/scsi/Makefile
@@ -3,7 +3,6 @@
 #
 
 zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_scsi.o zfcp_erp.o zfcp_qdio.o \
-            zfcp_fsf.o zfcp_dbf.o zfcp_sysfs_adapter.o zfcp_sysfs_port.o \
-            zfcp_sysfs_unit.o zfcp_fc.o zfcp_cfdc.o
+            zfcp_fsf.o zfcp_dbf.o zfcp_sysfs.o zfcp_fc.o zfcp_cfdc.o
 
 obj-$(CONFIG_ZFCP) += zfcp.o