The patch titled Blackfin SPI Driver: use the properl BIT_CTL_xxx defines has been removed from the -mm tree. Its filename was blackfin-spi-driver-use-the-properl-bit_ctl_xxx-defines.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Blackfin SPI Driver: use the properl BIT_CTL_xxx defines From: Mike Frysinger <vapier.adi@xxxxxxxxx> use the properl BIT_CTL_... defines rather than the internal driv er CFG_SPI_... defines Signed-off-by: Mike Frysinger <vapier.adi@xxxxxxxxx> Signed-off-by: Bryan Wu <cooloney@xxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/spi_bfin5xx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/spi/spi_bfin5xx.c~blackfin-spi-driver-use-the-properl-bit_ctl_xxx-defines drivers/spi/spi_bfin5xx.c --- a/drivers/spi/spi_bfin5xx.c~blackfin-spi-driver-use-the-properl-bit_ctl_xxx-defines +++ a/drivers/spi/spi_bfin5xx.c @@ -799,7 +799,7 @@ static void pump_transfers(unsigned long /* start SPI transfer */ write_CTRL(drv_data, - (cr | CFG_SPI_DMAWRITE | BIT_CTL_ENABLE)); + (cr | BIT_CTL_TIMOD_DMA_TX | BIT_CTL_ENABLE)); /* just return here, there can only be one transfer * in this mode @@ -827,7 +827,7 @@ static void pump_transfers(unsigned long dma_config |= WNR; dma_start_addr = (unsigned long)drv_data->rx; - cr |= CFG_SPI_DMAREAD; + cr |= BIT_CTL_TIMOD_DMA_RX | BIT_CTL_SENDOPT; } else if (drv_data->tx != NULL) { dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n"); @@ -839,7 +839,7 @@ static void pump_transfers(unsigned long drv_data->len_in_bytes)); dma_start_addr = (unsigned long)drv_data->tx; - cr |= CFG_SPI_DMAWRITE; + cr |= BIT_CTL_TIMOD_DMA_TX; } else BUG(); _ Patches currently in -mm which might be from vapier.adi@xxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html