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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (27 commits)
  Blackfin: hook up new rt_tgsigqueueinfo syscall
  Blackfin: improve CLKIN_HZ config default
  Blackfin: initial support for ftrace grapher
  Blackfin: initial support for ftrace
  Blackfin: enable support for LOCKDEP
  Blackfin: add preliminary support for STACKTRACE
  Blackfin: move custom sections into sections.h
  Blackfin: punt unused/wrong mutex-dec.h
  Blackfin: add support for irqflags
  Blackfin: add support for bzip2/lzma compressed kernel images
  Blackfin: convert Kconfig style to def_bool
  Blackfin: bf548-ezkit: update smsc911x resources
  Blackfin: update aedos-ipipe code to upstream 1.10-00
  Blackfin: bf537-stamp: update ADP5520 resources
  Blackfin: bf518f-ezbrd: fix SPI CS for SPI flash
  Blackfin: define SPI IRQ in board resources
  Blackfin: do not configure the UART early if on wrong processor
  Blackfin: fix deadlock in SMP IPI handler
  Blackfin: fix flag storage for irq funcs
  Blackfin: push down exception oops checking
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index f014cc21e813..011c5bddba6a 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -803,7 +803,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
                                 drv_data->rx, drv_data->len_in_bytes);
 
                         /* invalidate caches, if needed */
-                        if (bfin_addr_dcachable((unsigned long) drv_data->rx))
+                        if (bfin_addr_dcacheable((unsigned long) drv_data->rx))
                                 invalidate_dcache_range((unsigned long) drv_data->rx,
                                                         (unsigned long) (drv_data->rx +
                                                         drv_data->len_in_bytes));
@@ -816,7 +816,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
                         dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
 
                         /* flush caches, if needed */
-                        if (bfin_addr_dcachable((unsigned long) drv_data->tx))
+                        if (bfin_addr_dcacheable((unsigned long) drv_data->tx))
                                 flush_dcache_range((unsigned long) drv_data->tx,
                                                 (unsigned long) (drv_data->tx +
                                                 drv_data->len_in_bytes));