diff options
author | Ben Dooks | 2009-09-17 11:12:48 +0200 |
---|---|---|
committer | Ben Dooks | 2009-09-17 11:12:48 +0200 |
commit | 01875d56ae9877f41d672d57524d90d3d4d00adf (patch) | |
tree | df744b76afde73a8649400583bf7dfa1f7e30245 /arch/arm/plat-s3c64xx/include | |
parent | ARM: S3C: Add missing selection of S3C_DEV_NAND in machine Kconfigs. (diff) | |
parent | ARM: S3C64XX: DMA: Debugged alloc's with GFP_KERNEL flag in Intr context. (diff) | |
download | kernel-qcow2-linux-01875d56ae9877f41d672d57524d90d3d4d00adf.tar.gz kernel-qcow2-linux-01875d56ae9877f41d672d57524d90d3d4d00adf.tar.xz kernel-qcow2-linux-01875d56ae9877f41d672d57524d90d3d4d00adf.zip |
Merge branch 'next-s3c64xx-fixes' into next-s3c-fixes
Diffstat (limited to 'arch/arm/plat-s3c64xx/include')
-rw-r--r-- | arch/arm/plat-s3c64xx/include/plat/dma-plat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/include/plat/dma-plat.h b/arch/arm/plat-s3c64xx/include/plat/dma-plat.h index 0c30dd986725..8f76a1e474d6 100644 --- a/arch/arm/plat-s3c64xx/include/plat/dma-plat.h +++ b/arch/arm/plat-s3c64xx/include/plat/dma-plat.h @@ -26,7 +26,7 @@ struct s3c64xx_dma_buff { struct s3c64xx_dma_buff *next; void *pw; - struct pl080_lli *lli; + struct pl080s_lli *lli; dma_addr_t lli_dma; }; |