From c6d0ef34787104d6011ff2a1f7ed8a8c726e9d4d Mon Sep 17 00:00:00 2001
From: Udayan Kumar
Date: Sun, 1 Jul 2007 17:11:22 -0400
Subject: added endianness to natsemi.

---
 src/drivers/bitbash/spi_bit.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/drivers/bitbash')

diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c
index fe5838549..e2175d603 100644
--- a/src/drivers/bitbash/spi_bit.c
+++ b/src/drivers/bitbash/spi_bit.c
@@ -96,18 +96,13 @@ static void spi_bit_transfer ( struct spi_bit_basher *spibit,
 
 	DBG ( "Transferring %d bits in mode %x\n", len, bus->mode );
 
-<<<<<<< HEAD:src/drivers/bitbash/spi_bit.c
 	for ( step = 0 ; step < ( len * 2 ) ; step++ ) {
 		/* Calculate byte offset and byte mask */
 		bit_offset = ( ( endianness == SPI_BIT_BIG_ENDIAN ) ?
 			       ( len - ( step / 2 ) - 1 ) : ( step / 2 ) );
 		byte_offset = ( bit_offset / 8 );
 		byte_mask = ( 1 << ( bit_offset % 8 ) );
-=======
->>>>>>> debugging natsemi.c:src/drivers/bitbash/spi_bit.c
-<<<<<<< HEAD:src/drivers/bitbash/spi_bit.c
-=======
->>>>>>> debugging natsemi.c:src/drivers/bitbash/spi_bit.c
+
 		/* Shift data in or out */
 		if ( sclk == cpha ) {
 			const uint8_t *byte;
-- 
cgit v1.2.3-55-g7522