summaryrefslogtreecommitdiffstats
path: root/include/media/sr030pc30.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-03-29 01:24:29 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-29 01:24:29 +0200
commit5ede9ddfba424b5dad96e7ccd55607875a64ff6c (patch)
treeea08cb1c5d884f03ad5973ab5650e31b95c0b593 /include/media/sr030pc30.h
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff)
downloadlinux-5ede9ddfba424b5dad96e7ccd55607875a64ff6c.tar.xz
linux-5ede9ddfba424b5dad96e7ccd55607875a64ff6c.zip
memstick: make enable_dma less generic in r592
Fixes this build error: drivers/memstick/host/r592.c:26: error: 'enable_dma' redeclared as different kind of symbol arch/powerpc/include/asm/dma.h:189: note: previous definition of 'enable_dma' was here Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Alex Dubov <oakad@yahoo.com> Acked-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/media/sr030pc30.h')
0 files changed, 0 insertions, 0 deletions