On Fri, Oct 22, 2010 at 04:48, <[email protected]> wrote: > Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (9288 => 9289) > > #ifdef CONFIG_BF54x > - if (channel >= CH_UART2_RX && channel <= CH_UART3_TX) { > +#if defined(CH_UART2_RX) && defined(CH_UART2_TX) > +#if defined(CH_UART3_RX) && defined(CH_UART3_TX)
please use "# if" in these 2nd level indentations > Modified: trunk/arch/blackfin/mach-bf548/Kconfig (9288 => 9289) > > +config UART2_DMA_RX_ON_DMA18 > +config UART2_DMA_RX_ON_DMA13 > +config UART3_DMA_RX_ON_DMA20 > +config UART3_DMA_RX_ON_DMA15 dont use tabs after "config". just one space. > Modified: trunk/arch/blackfin/mach-bf548/include/mach/dma.h (9288 => 9289) > > +#if defined(CONFIG_UART2_DMA_RX_ON_DMA18) > +#define CH_UART2_RX 18 > +#define IRQ_UART2_RX BFIN_IRQ(33) /* UART2 RX (DMA18) Interrupt */ > +#define CH_UART2_TX 19 > +#define IRQ_UART2_TX BFIN_IRQ(34) /* UART2 TX (DMA19) Interrupt */ > +#elif defined(CONFIG_UART2_DMA_RX_ON_DMA13) > +#define CH_UART2_RX 13 > +#define IRQ_UART2_RX BFIN_IRQ(37) /* UART2 RX USE EPP1 (DMA13) > Interrupt > */ > +#define CH_UART2_TX 14 > +#define IRQ_UART2_TX BFIN_IRQ(38) /* UART2 RX USE EPP1 (DMA14) > Interrupt > */ > +#else > +#undef CH_UART2_RX > +#undef IRQ_UART2_RX > +#undef CH_UART2_TX > +#undef IRQ_UART2_TX > +#endif this logic breaks when using the Blackfin IRDA code: arch/blackfin/mach-bf548/boards/ezkit.c:525: error: ‘IRQ_UART3_RX’ undeclared here (not in a function) arch/blackfin/mach-bf548/boards/ezkit.c:530: error: ‘CH_UART3_RX’ undeclared here (not in a function) make[1]: *** [arch/blackfin/mach-bf548/boards/ezkit.o] Error 1 -mike _______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
