From 3aa8831e8773db023965ebd7149aa0b1db0f673f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov 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 --- 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 66c8d51..565f761 100644 --- a/ichspi.c +++ b/ichspi.c @@ -34,8 +34,6 @@ * */ -#if defined(__i386__) || defined(__x86_64__) - #include #include "flash.h" #include "chipdrivers.h" @@ -1173,5 +1171,3 @@ int via_init_spi(struct pci_dev *dev) return 0; } - -#endif diff --git a/it85spi.c b/it85spi.c index d122a18..ac3248c 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 #include #include @@ -416,5 +414,3 @@ int it85_spi_write_256(struct flashchip *flash, uint8_t * buf, int start, int le { return spi_write_chunked(flash, buf, start, len, 64); } - -#endif diff --git a/it87spi.c b/it87spi.c index fb1448a..c0f73e3 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 #include #include "flash.h" @@ -374,5 +372,3 @@ int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf, int start, return 0; } - -#endif diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 0e0d311..d9bb893 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -23,8 +23,6 @@ * created by Michael Karcher. */ -#if defined(__i386__) || defined(__x86_64__) - #include #include #include "flash.h" @@ -171,5 +169,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 #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 #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 #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 a01ee80..e64137b 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 #include "flash.h" @@ -139,7 +138,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 845cf58..95ab158 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" @@ -319,5 +317,3 @@ int sb600_probe_spi(struct pci_dev *dev) spi_controller = SPI_CONTROLLER_SB600; return 0; } - -#endif diff --git a/wbsio_spi.c b/wbsio_spi.c index acf9cb2..1a583a8 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" @@ -185,5 +183,3 @@ int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len) { return read_memmapped(flash, buf, start, len); } - -#endif -- 1.7.4