[PATCH] Fix PCMCIA SCSI driver build

Update the drivers/scsi/pcmcia directory to the new build system.

drivers/scsi/pcmcia/Makefile

-#
-# Makefile for the Linux PCMCIA SCSI drivers.
-#
 
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
-
-vpath %c ..
-
-CFLAGS_aha152x.o = -DPCMCIA -D__NO_VERSION__ -DAHA152X_STAT
-CFLAGS_fdomain.o = -DPCMCIA -D__NO_VERSION__
-CFLAGS_qlogicfas.o = -DPCMCIA -D__NO_VERSION__
+EXTRA_CFLAGS		+= -Idrivers/scsi
 
 # 16-bit client drivers
 obj-$(CONFIG_PCMCIA_QLOGIC)	+= qlogic_cs.o
@@ -19,6 +7,6 @@ obj-$(CONFIG_PCMCIA_FDOMAIN)	+= fdomain_cs.o
 obj-$(CONFIG_PCMCIA_AHA152X)	+= aha152x_cs.o
 obj-$(CONFIG_PCMCIA_NINJA_SCSI)	+= nsp_cs.o
 
-aha152x_cs-objs	:= aha152x_stub.o aha152x.o
-fdomain_cs-objs	:= fdomain_stub.o fdomain.o
-qlogic_cs-objs	:= qlogic_stub.o qlogicfas.o
+aha152x_cs-objs	:= aha152x_stub.o aha152x_core.o
+fdomain_cs-objs	:= fdomain_stub.o fdomain_core.o
+qlogic_cs-objs	:= qlogic_stub.o qlogic_core.o

drivers/scsi/pcmcia/aha152x_core.c

+#define PCMCIA	1
+#define AHA152X_STAT 1
+#include "aha152x.c"

drivers/scsi/pcmcia/aha152x_stub.c

@@ -45,11 +45,10 @@
 #include <scsi/scsi.h>
 #include <linux/major.h>
 #include <linux/blk.h>
-
-#include <../drivers/scsi/scsi.h>
-#include <../drivers/scsi/hosts.h>
 #include <scsi/scsi_ioctl.h>
-#include <../drivers/scsi/aha152x.h>
+
+#include "scsi.h"
+#include "hosts.h"
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -112,7 +111,8 @@ static int aha152x_event(event_t event, int priority,
 static dev_link_t *aha152x_attach(void);
 static void aha152x_detach(dev_link_t *);
 
-static Scsi_Host_Template driver_template = AHA152X;
+#define driver_template aha152x_driver_template
+extern Scsi_Host_Template aha152x_driver_template;
 
 static dev_link_t *dev_list = NULL;
 

drivers/scsi/pcmcia/fdomain_core.c

+#define PCMCIA 1
+#include "fdomain.c"

drivers/scsi/pcmcia/fdomain_stub.c

@@ -42,11 +42,10 @@
 #include <scsi/scsi.h>
 #include <linux/major.h>
 #include <linux/blk.h>
-
-#include <../drivers/scsi/scsi.h>
-#include <../drivers/scsi/hosts.h>
 #include <scsi/scsi_ioctl.h>
-#include <../drivers/scsi/fdomain.h>
+
+#include "scsi.h"
+#include "hosts.h"
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>

drivers/scsi/pcmcia/nsp_cs.c

@@ -50,8 +50,8 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include <../drivers/scsi/scsi.h>
-#include <../drivers/scsi/hosts.h>
+#include "scsi.h"
+#include "hosts.h"
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_ioctl.h>

drivers/scsi/pcmcia/nsp_cs.h

@@ -15,6 +15,8 @@
 #ifndef  __nsp_cs__
 #define  __nsp_cs__
 
+#include <linux/version.h>
+
 /* for debugging */
 //#define PCMCIA_DEBUG 9
 

drivers/scsi/pcmcia/qlogic_core.c

+#define PCMCIA 1
+#include "qlogicfas.c"

drivers/scsi/pcmcia/qlogic_stub.c

@@ -43,12 +43,10 @@
 #include <scsi/scsi.h>
 #include <linux/major.h>
 #include <linux/blk.h>
-
-#include <../drivers/scsi/scsi.h>
-#include <../drivers/scsi/hosts.h>
 #include <scsi/scsi_ioctl.h>
 
-#include <../drivers/scsi/qlogicfas.h>
+#include "scsi.h"
+#include "hosts.h"
 
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>