From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 19 Jun 2012 11:51:15 +0000 (+0000)
Subject: ar71xx: refresh patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6a10d5cddce38334a015f4d43bc0852999e609b;p=openwrt%2Fstaging%2Fkaloz.git

ar71xx: refresh patches

SVN-Revision: 32458
---

diff --git a/target/linux/ar71xx/patches-3.3/431-spi-add-various-flags.patch b/target/linux/ar71xx/patches-3.3/431-spi-add-various-flags.patch
index 722f659801..67ba43f0cd 100644
--- a/target/linux/ar71xx/patches-3.3/431-spi-add-various-flags.patch
+++ b/target/linux/ar71xx/patches-3.3/431-spi-add-various-flags.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/spi/spi.h
 +++ b/include/linux/spi/spi.h
-@@ -452,6 +452,8 @@ struct spi_transfer {
+@@ -503,6 +503,8 @@ struct spi_transfer {
  	dma_addr_t	rx_dma;
  
  	unsigned	cs_change:1;
@@ -9,7 +9,7 @@
  	u8		bits_per_word;
  	u16		delay_usecs;
  	u32		speed_hz;
-@@ -493,6 +495,7 @@ struct spi_message {
+@@ -544,6 +546,7 @@ struct spi_message {
  	struct spi_device	*spi;
  
  	unsigned		is_dma_mapped:1;
diff --git a/target/linux/ar71xx/patches-3.3/461-spi-add-type-field-to-spi_transfer.patch b/target/linux/ar71xx/patches-3.3/461-spi-add-type-field-to-spi_transfer.patch
index 3c7e98169d..850f24a07a 100644
--- a/target/linux/ar71xx/patches-3.3/461-spi-add-type-field-to-spi_transfer.patch
+++ b/target/linux/ar71xx/patches-3.3/461-spi-add-type-field-to-spi_transfer.patch
@@ -1,6 +1,6 @@
 --- a/include/linux/spi/spi.h
 +++ b/include/linux/spi/spi.h
-@@ -355,6 +355,12 @@ extern struct spi_master *spi_busnum_to_
+@@ -406,6 +406,12 @@ extern struct spi_master *spi_busnum_to_
  
  /*---------------------------------------------------------------------------*/
  
@@ -13,7 +13,7 @@
  /*
   * I/O INTERFACE between SPI controller and protocol drivers
   *
-@@ -457,6 +463,7 @@ struct spi_transfer {
+@@ -508,6 +514,7 @@ struct spi_transfer {
  	u8		bits_per_word;
  	u16		delay_usecs;
  	u32		speed_hz;
diff --git a/target/linux/ar71xx/patches-3.3/616-MIPS-ath79-EW_Dorin-support.patch b/target/linux/ar71xx/patches-3.3/616-MIPS-ath79-EW_Dorin-support.patch
index 09a9764b9c..486f6e56aa 100644
--- a/target/linux/ar71xx/patches-3.3/616-MIPS-ath79-EW_Dorin-support.patch
+++ b/target/linux/ar71xx/patches-3.3/616-MIPS-ath79-EW_Dorin-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -240,6 +240,18 @@
+@@ -240,6 +240,18 @@ config ATH79_MACH_DIR_825_B1
  	select ATH79_DEV_M25P80
  	select ATH79_DEV_USB
  
@@ -21,7 +21,7 @@
  	select SOC_AR71XX
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -32,6 +32,7 @@
+@@ -32,6 +32,7 @@ enum ath79_mach_type {
  	ATH79_MACH_DIR_615_C1,		/* D-Link DIR-615 rev. C1 */
  	ATH79_MACH_DIR_615_E4,		/* D-Link DIR-615 rev. E4 */
  	ATH79_MACH_DIR_825_B1,		/* D-Link DIR-825 rev. B1 */
@@ -31,7 +31,7 @@
  	ATH79_MACH_JA76PF2,		/* jjPlus JA76PF2 */
 --- a/arch/mips/ath79/Makefile
 +++ b/arch/mips/ath79/Makefile
-@@ -49,6 +49,7 @@
+@@ -49,6 +49,7 @@ obj-$(CONFIG_ATH79_MACH_DB120)		+= mach-
  obj-$(CONFIG_ATH79_MACH_DIR_600_A1)	+= mach-dir-600-a1.o
  obj-$(CONFIG_ATH79_MACH_DIR_615_C1)	+= mach-dir-615-c1.o
  obj-$(CONFIG_ATH79_MACH_DIR_825_B1)	+= mach-dir-825-b1.o