From: Christoph Hellwig <hch@infradead.org>
To: alan@lxorguk.ukuu.org.uk, torvalds@transmeta.com
Cc: SZALAY Attila <sasa@pheniscidae.tvnetwork.hu>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: Linux v2.5.54
Date: Fri, 3 Jan 2003 12:44:50 +0000 [thread overview]
Message-ID: <20030103124450.A28863@infradead.org> (raw)
In-Reply-To: <1041596348.27024.16.camel@irongate.swansea.linux.org.uk>; from alan@lxorguk.ukuu.org.uk on Fri, Jan 03, 2003 at 12:19:08PM +0000
On Fri, Jan 03, 2003 at 12:19:08PM +0000, Alan Cox wrote:
> The pcmcia scsi makefiles are broken. Its been reported repeatedly to
> the folks who broke the makefiles but nobody has fixed it. I have a hack
> for this but its versus 2.5.49/2.5.50
How about merging a proper fix instead of whining? :)
--- 1.6/drivers/scsi/pcmcia/Makefile Sat Dec 14 13:38:56 2002
+++ edited/drivers/scsi/pcmcia/Makefile Fri Jan 3 13:37:48 2003
@@ -1,17 +1,5 @@
-#
-# 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_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
--- 1.7/drivers/scsi/pcmcia/aha152x_stub.c Fri Nov 22 18:59:03 2002
+++ edited/drivers/scsi/pcmcia/aha152x_stub.c Fri Jan 3 13:17:04 2003
@@ -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 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;
--- 1.7/drivers/scsi/pcmcia/fdomain_stub.c Sun Dec 1 22:18:28 2002
+++ edited/drivers/scsi/pcmcia/fdomain_stub.c Fri Jan 3 13:17:04 2003
@@ -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>
--- 1.14/drivers/scsi/pcmcia/nsp_cs.c Fri Nov 22 18:59:03 2002
+++ edited/drivers/scsi/pcmcia/nsp_cs.c Fri Jan 3 13:17:04 2003
@@ -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>
--- 1.6/drivers/scsi/pcmcia/nsp_cs.h Tue Nov 5 18:12:44 2002
+++ edited/drivers/scsi/pcmcia/nsp_cs.h Fri Jan 3 13:17:04 2003
@@ -15,6 +15,8 @@
#ifndef __nsp_cs__
#define __nsp_cs__
+#include <linux/version.h>
+
/* for debugging */
//#define PCMCIA_DEBUG 9
--- 1.7/drivers/scsi/pcmcia/qlogic_stub.c Sun Dec 1 22:45:56 2002
+++ edited/drivers/scsi/pcmcia/qlogic_stub.c Fri Jan 3 13:17:04 2003
@@ -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>
--- /dev/null Sat Mar 23 20:46:34 2002
+++ b/drivers/scsi/pcmcia/aha152x_core.c Fri Jan 3 13:36:43 2003
@@ -0,0 +1,3 @@
+#define PCMCIA 1
+#define AHA152X_STAT 1
+#include "aha152x.c"
--- /dev/null Sat Mar 23 20:46:34 2002
+++ b/drivers/scsi/pcmcia/fdomain_core.c Fri Jan 3 13:35:40 2003
@@ -0,0 +1,2 @@
+#define PCMCIA 1
+#include "fdomain.c"
--- /dev/null Sat Mar 23 20:46:34 2002
+++ b/drivers/scsi/pcmcia/qlogic_core.c Fri Jan 3 13:38:21 2003
@@ -0,0 +1,2 @@
+#define PCMCIA 1
+#include "qlogicfas.c"
next prev parent reply other threads:[~2003-01-03 12:36 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-02 3:43 Linux v2.5.54 Linus Torvalds
2003-01-02 4:38 ` William Lee Irwin III
2003-01-02 10:43 ` Rusty Russell
2003-01-02 10:55 ` Andi Kleen
2003-01-02 11:13 ` William Lee Irwin III
2003-01-02 4:52 ` Linux v2.5.54 - OHCI-HCD build fails Murray J. Root
2003-01-02 5:00 ` Murray J. Root
2003-01-02 5:16 ` [PATCH] " Andres Salomon
2003-01-02 5:43 ` Murray J. Root
2003-01-02 6:10 ` Andres Salomon
2003-01-02 10:34 ` Linux v2.5.54 SZALAY Attila
2003-01-02 15:50 ` Randy.Dunlap
2003-01-02 15:56 ` Randy.Dunlap
2003-01-03 9:32 ` SZALAY Attila
2003-01-03 11:04 ` SZALAY Attila
2003-01-03 12:19 ` Alan Cox
2003-01-03 12:44 ` Christoph Hellwig [this message]
2003-01-03 16:13 ` Randy.Dunlap
2003-01-02 15:08 ` Adrian Bunk
2003-01-02 15:10 ` Christoph Hellwig
2003-01-02 17:18 ` Adrian Bunk
2003-01-02 17:31 ` Jaroslav Kysela
2003-01-02 13:26 ` Adam Belay
2003-01-03 0:08 ` [2.5.54] OOPS: unable to handle kernel paging request Steven Barnhart
2003-01-03 6:49 ` Paul Rolland
2003-01-02 17:49 ` Linux v2.5.54 Rudmer van Dijk
2003-01-02 23:48 ` [OOPS] Linux v2.5.54 Riva Framebuffer Udo A. Steinberg
2003-01-04 21:13 ` James Simmons
2003-01-04 21:13 ` James Simmons
-- strict thread matches above, loose matches on Subject: below --
2003-01-02 14:42 Linux v2.5.54 Paolo Ciarrocchi
2003-01-04 10:20 ` Kasper Dupont
2003-01-04 11:47 Paolo Ciarrocchi
2003-01-04 12:27 ` Kasper Dupont
2003-01-04 14:06 Paolo Ciarrocchi
2003-01-04 14:19 ` Kasper Dupont
2003-01-04 17:10 Paolo Ciarrocchi
2003-01-04 18:14 Paolo Ciarrocchi
2003-01-04 22:14 ` Kasper Dupont
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030103124450.A28863@infradead.org \
--to=hch@infradead.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=sasa@pheniscidae.tvnetwork.hu \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.