From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jan 2011 01:08:46 +0000 (-0800)
Subject: Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: firefly_0821_release~7613^2~3100
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=021db8e2bde53024a163fb4417a185de46fe77aa;p=firefly-linux-kernel-4.4.55.git

Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
  spi/omap: Fix DMA API usage in OMAP MCSPI driver
  spi/imx: correct the test on platform_get_irq() return value
  spi/topcliff: Typo fix threhold to threshold
  spi/dw_spi Typo change diable to disable.
  spi/fsl_espi: change the read behaviour of the SPIRF
  spi/mpc52xx-psc-spi: move probe/remove to proper sections
  spi/dw_spi: add DMA support
  spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
  spi/dw_spi: Fix too short timeout in spi polling loop
  spi/pl022: convert running variable
  spi/pl022: convert busy flag to a bool
  spi/pl022: pass the returned sglen to the DMA engine
  spi/pl022: map the buffers on the DMA engine
  spi/topcliff_pch: Fix data transfer issue
  spi/imx: remove autodetection
  spi/pxa2xx: pass of_node to spi device and set a parent device
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add CE4100 support
  ...
---

021db8e2bde53024a163fb4417a185de46fe77aa
diff --cc arch/arm/mach-pxa/spitz.c
index 0499a69e7673,4fd5572f6995..0bc938729c4c
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@@ -42,10 -41,8 +42,9 @@@
  #include <mach/mmc.h>
  #include <mach/ohci.h>
  #include <mach/pxafb.h>
- #include <mach/pxa2xx_spi.h>
  #include <mach/spitz.h>
  #include <mach/sharpsl_pm.h>
 +#include <mach/smemc.h>
  
  #include <plat/i2c.h>
  
diff --cc arch/arm/mach-pxa/stargate2.c
index 3498a1423943,325f6ac6b591..9a14fdb83c82
--- a/arch/arm/mach-pxa/stargate2.c
+++ b/arch/arm/mach-pxa/stargate2.c
@@@ -46,11 -46,10 +46,11 @@@
  #include <plat/i2c.h>
  #include <mach/mmc.h>
  #include <mach/udc.h>
- #include <mach/pxa2xx_spi.h>
  #include <mach/pxa27x-udc.h>
 +#include <mach/smemc.h>
  
  #include <linux/spi/spi.h>
+ #include <linux/spi/pxa2xx_spi.h>
  #include <linux/mfd/da903x.h>
  #include <linux/sht15.h>
  
diff --cc arch/arm/mach-pxa/tosa.c
index 57d61ee9b226,7b5765dacbd9..af152e70cfcf
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@@ -44,9 -45,7 +45,8 @@@
  #include <mach/mmc.h>
  #include <mach/udc.h>
  #include <mach/tosa_bt.h>
- #include <mach/pxa2xx_spi.h>
  #include <mach/audio.h>
 +#include <mach/smemc.h>
  
  #include <asm/mach/arch.h>
  #include <mach/tosa.h>