diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-09-17 05:12:48 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-09-17 05:12:48 -0400 |
| commit | 01875d56ae9877f41d672d57524d90d3d4d00adf (patch) | |
| tree | df744b76afde73a8649400583bf7dfa1f7e30245 /arch/arm/plat-s3c64xx/include | |
| parent | d23b3517400e4638e76e8c8667c100721c6f03fe (diff) | |
| parent | b93011e72c1476b08ff62977ecf648080ba38c1a (diff) | |
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 { | |||
| 26 | struct s3c64xx_dma_buff *next; | 26 | struct s3c64xx_dma_buff *next; |
| 27 | 27 | ||
| 28 | void *pw; | 28 | void *pw; |
| 29 | struct pl080_lli *lli; | 29 | struct pl080s_lli *lli; |
| 30 | dma_addr_t lli_dma; | 30 | dma_addr_t lli_dma; |
| 31 | }; | 31 | }; |
| 32 | 32 | ||