From ca0d301974482433aa26d3eda6363370c8e29497 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 13 Jun 2011 20:39:21 +0200
Subject: [PATCH] --- yaml --- r: 257800 b: refs/heads/master c:
 2ba51ea28ba54ea8808ba7dfd694f1dd37e8b7c7 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/sun3_scsi.c     | 8 ++++++--
 trunk/drivers/scsi/sun3_scsi_vme.c | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 052db8dba206..6c932b59f61a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149
+refs/heads/master: 2ba51ea28ba54ea8808ba7dfd694f1dd37e8b7c7
diff --git a/trunk/drivers/scsi/sun3_scsi.c b/trunk/drivers/scsi/sun3_scsi.c
index 2cc83ef3f37f..baf7328de956 100644
--- a/trunk/drivers/scsi/sun3_scsi.c
+++ b/trunk/drivers/scsi/sun3_scsi.c
@@ -70,6 +70,12 @@
 #include <asm/idprom.h>
 #include <asm/machines.h>
 
+#define NDEBUG 0
+
+#define NDEBUG_ABORT		0x00100000
+#define NDEBUG_TAGS		0x00200000
+#define NDEBUG_MERGING		0x00400000
+
 /* dma on! */
 #define REAL_DMA
 
@@ -86,8 +92,6 @@ static void NCR5380_print(struct Scsi_Host *instance);
 /*#define RESET_BOOT */
 #define DRIVER_SETUP
 
-#define NDEBUG 0
-
 /*
  * BUG can be used to trigger a strange code-size related hang on 2.1 kernels
  */
diff --git a/trunk/drivers/scsi/sun3_scsi_vme.c b/trunk/drivers/scsi/sun3_scsi_vme.c
index c0252db4da68..fbba78e5722e 100644
--- a/trunk/drivers/scsi/sun3_scsi_vme.c
+++ b/trunk/drivers/scsi/sun3_scsi_vme.c
@@ -39,6 +39,12 @@
 /* dma on! */
 #define REAL_DMA
 
+#define NDEBUG 0
+
+#define NDEBUG_ABORT		0x00100000
+#define NDEBUG_TAGS		0x00200000
+#define NDEBUG_MERGING		0x00400000
+
 #include "scsi.h"
 #include "initio.h"
 #include <scsi/scsi_host.h>
@@ -50,8 +56,6 @@ extern int sun3_map_test(unsigned long, char *);
 /*#define RESET_BOOT */
 #define DRIVER_SETUP
 
-#define NDEBUG 0
-
 /*
  * BUG can be used to trigger a strange code-size related hang on 2.1 kernels
  */