From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2010 00:02:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=39710479303fd3affb3e204e9a7a75cc676977b5;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'for-linus' of git://git./linux/kernel/git/vapier/blackfin

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (96 commits)
  Blackfin: stop cleaning include/asm/asm-offsets.h
  Blackfin: scale calibration when cpu freq changes
  Blackfin: eat spurious space in asm/dpmc.h
  Blackfin: fix anomaly 283 handling with exact hardware error
  Blackfin: bf537-stamp: add example ADXL346 orientation resources
  Blackfin: bf537-stamp: add example AD2S1210 IIO resources
  Blackfin: don't support keypad wakeup from hibernate
  Blackfin: bf537-stamp: add example AD7416 IIO resources
  Blackfin: bf537-stamp: add example ADP8860 backlight/led resources
  Blackfin: bf537-stamp: add example AD7414 temp sensor resources
  Blackfin: rename AD1836 to AD183X in board files
  Blackfin: bf537-stamp: add example AD2S120x resources
  Blackfin: add support for the on-chip MAC status interrupts
  Blackfin: asm/page.h: pull in asm-generic headers
  Blackfin: mark gpio lib functions static
  Blackfin: bf537-stamp: add example ADAU1361 resources
  Blackfin: GPIO: implement to_irq handler
  Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources
  Blackfin: bf537-stamp: add example AD2S90 resources
  Blackfin: bf537-stamp: add example AD5398 power regulator resources
  ...
---

39710479303fd3affb3e204e9a7a75cc676977b5
diff --cc arch/blackfin/include/asm/dma-mapping.h
index 413a30314a6f,e63f6d9fdab8..212cb80fd74b
--- a/arch/blackfin/include/asm/dma-mapping.h
+++ b/arch/blackfin/include/asm/dma-mapping.h
@@@ -64,7 -59,22 +59,15 @@@ __dma_sync_inline(dma_addr_t addr, size
  		break;
  	}
  }
+ static inline void
+ _dma_sync(dma_addr_t addr, size_t size, enum dma_data_direction dir)
+ {
+ 	if (__builtin_constant_p(dir))
+ 		__dma_sync_inline(addr, size, dir);
+ 	else
+ 		__dma_sync(addr, size, dir);
+ }
  
 -/*
 - * Map a single buffer of the indicated size for DMA in streaming mode.
 - * The 32-bit bus address to use is returned.
 - *
 - * Once the device is given the dma address, the device owns this memory
 - * until either pci_unmap_single or pci_dma_sync_single is performed.
 - */
  static inline dma_addr_t
  dma_map_single(struct device *dev, void *ptr, size_t size,
  	       enum dma_data_direction dir)