From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 22 Oct 2010 01:31:47 +0000 (+0000)
Subject: ar71xx: remove some unnecessary patches
X-Git-Tag: reboot~18623
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=b3e708acd790b0b2d309dcf18779aabdf3e16361

ar71xx: remove some unnecessary patches

SVN-Revision: 23581
---

diff --git a/target/linux/ar71xx/patches-2.6.36/201-ap83_spi_controller.patch b/target/linux/ar71xx/patches-2.6.36/201-ap83_spi_controller.patch
index 32f9f0d5f2..a8e889a7bd 100644
--- a/target/linux/ar71xx/patches-2.6.36/201-ap83_spi_controller.patch
+++ b/target/linux/ar71xx/patches-2.6.36/201-ap83_spi_controller.patch
@@ -25,38 +25,3 @@
  config SPI_AR71XX
  	tristate "Atheros AR71xx SPI Controller"
  	depends on SPI_MASTER && ATHEROS_AR71XX
---- a/drivers/spi/ap83_spi.c
-+++ b/drivers/spi/ap83_spi.c
-@@ -132,28 +132,28 @@ static u32 ap83_spi_txrx_mode0(struct sp
- 			       unsigned nsecs, u32 word, u8 bits)
- {
- 	dev_dbg(&spi->dev, "TXRX0 word=%08x, bits=%u\n", word, bits);
--	return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits);
- }
- 
- static u32 ap83_spi_txrx_mode1(struct spi_device *spi,
- 			       unsigned nsecs, u32 word, u8 bits)
- {
- 	dev_dbg(&spi->dev, "TXRX1 word=%08x, bits=%u\n", word, bits);
--	return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits);
- }
- 
- static u32 ap83_spi_txrx_mode2(struct spi_device *spi,
- 			       unsigned nsecs, u32 word, u8 bits)
- {
- 	dev_dbg(&spi->dev, "TXRX2 word=%08x, bits=%u\n", word, bits);
--	return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+	return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits);
- }
- 
- static u32 ap83_spi_txrx_mode3(struct spi_device *spi,
- 			       unsigned nsecs, u32 word, u8 bits)
- {
- 	dev_dbg(&spi->dev, "TXRX3 word=%08x, bits=%u\n", word, bits);
--	return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+	return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits);
- }
- 
- static int ap83_spi_probe(struct platform_device *pdev)
diff --git a/target/linux/ar71xx/patches-2.6.36/210-spi_bitbang_txrx.patch b/target/linux/ar71xx/patches-2.6.36/210-spi_bitbang_txrx.patch
deleted file mode 100644
index d4b8ecba4c..0000000000
--- a/target/linux/ar71xx/patches-2.6.36/210-spi_bitbang_txrx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/spi/ap83_spi.c
-+++ b/drivers/spi/ap83_spi.c
-@@ -125,8 +125,8 @@ static void ap83_spi_chipselect(struct s
- 		do_spidelay(spi, nsecs);				\
- 	} while (0)
- 
--#define EXPAND_BITBANG_TXRX
- #include <linux/spi/spi_bitbang.h>
-+#include "spi_bitbang_txrx.h"
- 
- static u32 ap83_spi_txrx_mode0(struct spi_device *spi,
- 			       unsigned nsecs, u32 word, u8 bits)