Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / scsi / isci / Makefile

diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile
index 522e7a7..3359e10 100644 (file)
--- a/drivers/scsi/isci/Makefile
+++ b/drivers/scsi/isci/Makefile
@@ -1,29 +1,8 @@
-#TODO kill SCIC_SDS_4_ENABLED it is always true for this
-#generation of silicon
-EXTRA_CFLAGS += -DSCIC_SDS_4_ENABLED
-
-#temporary until atapi support ready
-EXTRA_CFLAGS += -DDISABLE_ATAPI
-
-EXTRA_CFLAGS += -Idrivers/scsi/isci/core/ -Idrivers/scsi/isci/
 obj-$(CONFIG_SCSI_ISCI) += isci.o
-isci-objs := init.o phy.o request.o sata.o \
-            remote_device.o port.o timers.o \
+isci-objs := init.o phy.o request.o \
+            remote_device.o port.o \
             host.o task.o probe_roms.o \
-            core/scic_sds_controller.o  \
-            core/scic_sds_remote_device.o    \
-            core/scic_sds_request.o \
-            core/scic_sds_stp_request.o \
-            core/scic_sds_stp_packet_request.o \
-            core/scic_sds_stp_remote_device.o \
-            core/scic_sds_port.o \
-            core/scic_sds_port_configuration_agent.o \
-            core/scic_sds_phy.o \
-            core/scic_sds_ssp_request.o \
-            core/scic_sds_remote_node_context.o \
-            core/scic_sds_smp_request.o \
-            core/scic_sds_smp_remote_device.o \
-            core/scic_sds_remote_node_table.o \
-            core/scic_sds_unsolicited_frame_control.o \
-            core/sci_base_state_machine.o \
-            core/sci_util.o
+            remote_node_context.o \
+            remote_node_table.o \
+            unsolicited_frame_control.o \
+            port_config.o \