diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-29 13:54:52 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-29 13:54:52 +1000 |
commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
tree | bf66ccdd613019035ebab535762366aa1026399b /arch/arm/plat-s3c24xx/dma.c | |
parent | d7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff) | |
parent | b5c42bc8db17db80917f99205a03c51f17354495 (diff) | |
download | op-kernel-dev-435462c6e639065460e91903d6bd2af0f5762fde.zip op-kernel-dev-435462c6e639065460e91903d6bd2af0f5762fde.tar.gz |
Merge branch 'merge' into next
Diffstat (limited to 'arch/arm/plat-s3c24xx/dma.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index aee2aeb..07326f6 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@ -1235,7 +1235,7 @@ int s3c2410_dma_getposition(unsigned int channel, dma_addr_t *src, dma_addr_t *d EXPORT_SYMBOL(s3c2410_dma_getposition); -static struct s3c2410_dma_chan *to_dma_chan(struct sys_device *dev) +static inline struct s3c2410_dma_chan *to_dma_chan(struct sys_device *dev) { return container_of(dev, struct s3c2410_dma_chan, dev); } |