Signed-off-by: Thomas Bogendoerfer tsbogend@alpha.franken.de --- drivers/dma/Kconfig | 2 +- drivers/dma/txx9dmac.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index d242c7632621..22fedfb6f5f9 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -601,7 +601,7 @@ config S3C24XX_DMAC
config TXX9_DMAC tristate "Toshiba TXx9 SoC DMA support" - depends on MACH_TX49XX || MACH_TX39XX + depends on MACH_TX39XX select DMA_ENGINE help Support the TXx9 SoC internal DMA controller. This can be diff --git a/drivers/dma/txx9dmac.h b/drivers/dma/txx9dmac.h index aa53eafb1519..4acf29f50a29 100644 --- a/drivers/dma/txx9dmac.h +++ b/drivers/dma/txx9dmac.h @@ -26,11 +26,6 @@ * DMA channel. */
-#ifdef CONFIG_MACH_TX49XX -static inline bool txx9_dma_have_SMPCHN(void) -{ - return true; -} #define TXX9_DMA_USE_SIMPLE_CHAIN #else static inline bool txx9_dma_have_SMPCHN(void) @@ -40,13 +35,8 @@ static inline bool txx9_dma_have_SMPCHN(void) #endif
#ifdef __LITTLE_ENDIAN -#ifdef CONFIG_MACH_TX49XX -#define CCR_LE TXX9_DMA_CCR_LE -#define MCR_LE 0 -#else #define CCR_LE 0 #define MCR_LE TXX9_DMA_MCR_LE -#endif #else #define CCR_LE 0 #define MCR_LE 0