Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  i.MX31: framebuffer driver
  i.MX31: Image Processing Unit DMA and IRQ drivers
  dmaengine: add async_tx_clear_ack() macro
  dmaengine: dma_issue_pending_all == nop when CONFIG_DMA_ENGINE=n
  dmaengine: kill some dubious WARN_ONCEs
  fsldma: print correct IRQ on mpc83xx
  fsldma: check for NO_IRQ in fsl_dma_chan_remove()
  dmatest: Use custom map/unmap for destination buffer
  fsldma: use a valid 'device' for dma_pool_create
  dmaengine: fix dependency chaining

diff --combined drivers/video/Makefile
index be2b657546efe3d96e2403476c8c896d774959e4,a9c641c956c4a069c46f0ba6cd6d65253cdf7bfb..2a998ca6181d0ce73c0637077634f0005fb1947c
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -28,7 -28,7 +28,7 @@@ obj-$(CONFIG_FB_DDC)           += fb_dd
  obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
  
  # Hardware specific drivers go first
 -obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
 +obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p_planar.o
  obj-$(CONFIG_FB_ARC)              += arcfb.o
  obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
  obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o
@@@ -72,7 -72,7 +72,7 @@@ obj-$(CONFIG_FB_TCX)              += tc
  obj-$(CONFIG_FB_LEO)              += leo.o sbuslib.o
  obj-$(CONFIG_FB_SGIVW)            += sgivwfb.o
  obj-$(CONFIG_FB_ACORN)            += acornfb.o
 -obj-$(CONFIG_FB_ATARI)            += atafb.o c2p.o atafb_mfb.o \
 +obj-$(CONFIG_FB_ATARI)            += atafb.o c2p_iplan2.o atafb_mfb.o \
                                       atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o
  obj-$(CONFIG_FB_MAC)              += macfb.o
  obj-$(CONFIG_FB_HECUBA)           += hecubafb.o
@@@ -132,6 -132,7 +132,7 @@@ obj-$(CONFIG_FB_VGA16)            += vg
  obj-$(CONFIG_FB_OF)               += offb.o
  obj-$(CONFIG_FB_BF54X_LQ043)    += bf54x-lq043fb.o
  obj-$(CONFIG_FB_BFIN_T350MCQB)          += bfin-t350mcqb-fb.o
+ obj-$(CONFIG_FB_MX3)              += mx3fb.o
  
  # the test framebuffer is last
  obj-$(CONFIG_FB_VIRTUAL)          += vfb.o

diff --combined include/linux/dmaengine.h
index c73f1e2b59b730a876f4510eeba68075b746a9f7,34f124d7fb945a003a24d4087325cd8a67382b1b..3e0f64c335c8d7252f048319204c1c0648f77fbf
--- 1/include/linux/dmaengine.h
--- 2/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -270,18 -270,8 +270,18 @@@ struct dma_device 
  
  /* --- public DMA engine API --- */
  
 +#ifdef CONFIG_DMA_ENGINE
  void dmaengine_get(void);
  void dmaengine_put(void);
 +#else
 +static inline void dmaengine_get(void)
 +{
 +}
 +static inline void dmaengine_put(void)
 +{
 +}
 +#endif
 +
  dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan,
        void *dest, void *src, size_t len);
  dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan,
@@@ -297,6 -287,11 +297,11 @@@ static inline void async_tx_ack(struct 
        tx->flags |= DMA_CTRL_ACK;
  }
  
+ static inline void async_tx_clear_ack(struct dma_async_tx_descriptor *tx)
+ {
+       tx->flags &= ~DMA_CTRL_ACK;
+ }
+ 
  static inline bool async_tx_test_ack(struct dma_async_tx_descriptor *tx)
  {
        return (tx->flags & DMA_CTRL_ACK) == DMA_CTRL_ACK;
@@@ -400,11 -395,16 +405,16 @@@ static inline enum dma_status dma_async
  enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
  #ifdef CONFIG_DMA_ENGINE
  enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
+ void dma_issue_pending_all(void);
  #else
  static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx)
  {
        return DMA_SUCCESS;
  }
+ static inline void dma_issue_pending_all(void)
+ {
+       do { } while (0);
+ }
  #endif
  
  /* --- DMA device --- */
@@@ -413,7 -413,6 +423,6 @@@ int dma_async_device_register(struct dm
  void dma_async_device_unregister(struct dma_device *device);
  void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
  struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
- void dma_issue_pending_all(void);
  #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
  struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param);
  void dma_release_channel(struct dma_chan *chan);