From f46590ff1360ecf502ec2fbd54acc19c87356cdc Mon Sep 17 00:00:00 2001
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Mon, 25 Sep 2006 16:59:03 -0700
Subject: [PATCH] --- yaml --- r: 38943 b: refs/heads/master c:
 c03d10ab6aafe6706520e1595d6e91d0e50ac5ad h: refs/heads/master i:   38941:
 b5e0afa8a10a814d26a2e266aae35de6a101edb5   38939:
 c8fa2113ac9e96537e6d594d4aee1fe3a7681f57   38935:
 6b4e88b712d685a44fe28d316cb21d8df07b2054   38927:
 de5c1b390adde757f09198498b28b800b0d1f236   38911:
 270a202d1785a666dee95f7a2fc3552880a8621f v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/scsi/gdth.h | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index b404f90a8c8d..fcebe0f2ca2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 288777f89a63ca0bece7b5e082ce9beebacfb8fd
+refs/heads/master: c03d10ab6aafe6706520e1595d6e91d0e50ac5ad
diff --git a/trunk/drivers/scsi/gdth.h b/trunk/drivers/scsi/gdth.h
index 47eae0299750..8c29eafd51c5 100644
--- a/trunk/drivers/scsi/gdth.h
+++ b/trunk/drivers/scsi/gdth.h
@@ -936,18 +936,12 @@ typedef struct {
     gdth_binfo_str      binfo;                  /* controller info */
     gdth_evt_data       dvr;                    /* event structure */
     spinlock_t          smp_lock;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
     struct pci_dev      *pdev;
-#endif
     char                oem_name[8];
 #ifdef GDTH_DMA_STATISTICS
     ulong               dma32_cnt, dma64_cnt;   /* statistics: DMA buffer */
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
     struct scsi_device         *sdev;
-#else
-    struct scsi_device         sdev;
-#endif
 } gdth_ha_str;
 
 /* structure for scsi_register(), SCSI bus != 0 */
@@ -1029,10 +1023,6 @@ typedef struct {
 
 /* function prototyping */
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 int gdth_proc_info(struct Scsi_Host *, char *,char **,off_t,int,int);
-#else
-int gdth_proc_info(char *,char **,off_t,int,int,int);
-#endif
 
 #endif