commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=87d65d5fc1dd849cf6eeb5140bf126158050deaf branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Fix compile error after update to 3.3 Signed-off-by: Bob Liu <[email protected]> --- arch/blackfin/include/asm/dma.h | 12 ++++++------ arch/blackfin/mach-bf518/boards/ezbrd.c | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/blackfin/include/asm/dma.h b/arch/blackfin/include/asm/dma.h index 929a377..40e9c2b 100644 --- a/arch/blackfin/include/asm/dma.h +++ b/arch/blackfin/include/asm/dma.h @@ -56,13 +56,13 @@ #define DMA_SYNC_RESTART 1 #ifdef DMA_MMR_SIZE_32 -# define DMA_MMR_SIZE_TYPE long -# define DMA_MMR_READ bfin_read32 -# define DMA_MMR_WRITE bfin_write32 +#define DMA_MMR_SIZE_TYPE long +#define DMA_MMR_READ bfin_read32 +#define DMA_MMR_WRITE bfin_write32 #else -# define DMA_MMR_SIZE_TYPE short -# define DMA_MMR_READ bfin_read16 -# define DMA_MMR_WRITE bfin_write16 +#define DMA_MMR_SIZE_TYPE short +#define DMA_MMR_READ bfin_read16 +#define DMA_MMR_WRITE bfin_write16 #endif struct dma_desc_array { diff --git a/arch/blackfin/mach-bf518/boards/ezbrd.c b/arch/blackfin/mach-bf518/boards/ezbrd.c index ee0583c..a173957 100644 --- a/arch/blackfin/mach-bf518/boards/ezbrd.c +++ b/arch/blackfin/mach-bf518/boards/ezbrd.c @@ -291,8 +291,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { .mode = SPI_CPHA | SPI_CPOL, }, #endif - .vlan1_mask = 1, - .vlan2_mask = 2, }; /* SPI controller data */
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
