221 lines
5.1 KiB
Diff
221 lines
5.1 KiB
Diff
From 2028cef04a1eafc0ca4a5b4e1ad8f38905ad7b31 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 ddd14d3..61e8734 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"
|
|
@@ -1287,5 +1285,3 @@ int via_init_spi(struct pci_dev *dev)
|
|
|
|
return 0;
|
|
}
|
|
-
|
|
-#endif
|
|
diff --git a/it85spi.c b/it85spi.c
|
|
index c6c945b..24af0a3 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>
|
|
@@ -357,5 +355,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 d39ee71..8c9b2e3 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"
|
|
@@ -113,7 +111,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 3cae253..58f4471 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"
|
|
@@ -88,7 +86,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 d97deb1..2951d0f 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"
|
|
@@ -92,7 +90,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 7889f91..ec40d10 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.5.1
|
|
|