From a3b5e3fe0e99dca11e1d88f5debb1159583d9eb3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 18 Sep 2010 09:40:01 +0400
Subject: [PATCH 06/10] Kill some x86-related ifdefs in code - this is now
 controlled via autotools

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 ichspi.c     |    4 ----
 it85spi.c    |    4 ----
 it87spi.c    |    4 ----
 mcp6x_spi.c  |    4 ----
 nic3com.c    |    6 ------
 nicnatsemi.c |    6 ------
 nicrealtek.c |    6 ------
 rayer_spi.c  |    5 -----
 sb600spi.c   |    4 ----
 wbsio_spi.c  |    4 ----
 10 files changed, 0 insertions(+), 47 deletions(-)

diff --git a/ichspi.c b/ichspi.c
index 99c4613..8942b68 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -34,8 +34,6 @@
  *
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <string.h>
 #include "flash.h"
 #include "chipdrivers.h"
@@ -1418,5 +1416,3 @@ int via_init_spi(struct pci_dev *dev)
 
 	return 0;
 }
-
-#endif
diff --git a/it85spi.c b/it85spi.c
index d4ca13b..9d29e46 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -24,8 +24,6 @@
  * Contains the ITE IT85* SPI specific routines
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -361,5 +359,3 @@ static int it85xx_spi_send_command(unsigned int writecnt, unsigned int readcnt,
 
 	return 0;
 }
-
-#endif
diff --git a/it87spi.c b/it87spi.c
index 54f41fa..db60cbc 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -23,8 +23,6 @@
  * Contains the ITE IT87* SPI specific routines
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <string.h>
 #include <stdlib.h>
 #include "flash.h"
@@ -399,5 +397,3 @@ static int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int
 
 	return 0;
 }
-
-#endif
diff --git a/mcp6x_spi.c b/mcp6x_spi.c
index d2c31be..19509be 100644
--- a/mcp6x_spi.c
+++ b/mcp6x_spi.c
@@ -23,8 +23,6 @@
  * created by Michael Karcher.
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
@@ -168,5 +166,3 @@ int mcp6x_spi_init(int want_spi)
 
 	return 0;
 }
-
-#endif
diff --git a/nic3com.c b/nic3com.c
index bcc63e0..72c1029 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <stdlib.h>
 #include "flash.h"
 #include "programmer.h"
@@ -115,7 +113,3 @@ uint8_t nic3com_chip_readb(const chipaddr addr)
 	OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR);
 	return INB(io_base_addr + BIOS_ROM_DATA);
 }
-
-#else
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicnatsemi.c b/nicnatsemi.c
index ac37cf0..b2a2f66 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <stdlib.h>
 #include "flash.h"
 #include "programmer.h"
@@ -90,7 +88,3 @@ uint8_t nicnatsemi_chip_readb(const chipaddr addr)
 	 */
 	return INB(io_base_addr + BOOT_ROM_DATA);
 }
-
-#else
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/nicrealtek.c b/nicrealtek.c
index 4566e50..b57f5bf 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include <stdlib.h>
 #include "flash.h"
 #include "programmer.h"
@@ -94,7 +92,3 @@ uint8_t nicrealtek_chip_readb(const chipaddr addr)
 
 	return val;
 }
-
-#else
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/rayer_spi.c b/rayer_spi.c
index 0807487..f722f95 100644
--- a/rayer_spi.c
+++ b/rayer_spi.c
@@ -28,7 +28,6 @@
  * most OS parport drivers will perform many unnecessary accesses although
  * this driver just treats the parallel port as a GPIO set.
  */
-#if defined(__i386__) || defined(__x86_64__)
 
 #include <stdlib.h>
 #include "flash.h"
@@ -136,7 +135,3 @@ int rayer_spi_init(void)
 
 	return 0;
 }
-
-#else
-#error PCI port I/O access is not supported on this architecture yet.
-#endif
diff --git a/sb600spi.c b/sb600spi.c
index 37aac3b..e176f00 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include "flash.h"
 #include "chipdrivers.h"
 #include "programmer.h"
@@ -317,5 +315,3 @@ int sb600_probe_spi(struct pci_dev *dev)
 	register_spi_programmer(&spi_programmer_sb600);
 	return 0;
 }
-
-#endif
diff --git a/wbsio_spi.c b/wbsio_spi.c
index 851c87f..e166d8e 100644
--- a/wbsio_spi.c
+++ b/wbsio_spi.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#if defined(__i386__) || defined(__x86_64__)
-
 #include "flash.h"
 #include "chipdrivers.h"
 #include "programmer.h"
@@ -198,5 +196,3 @@ static int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int
 {
 	return read_memmapped(flash, buf, start, len);
 }
-
-#endif
-- 
1.7.6