diff options
| author | Stephen Rothwell <[email protected]> | 2011-03-28 23:24:29 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-03-28 23:24:29 +0000 |
| commit | 5ede9ddfba424b5dad96e7ccd55607875a64ff6c (patch) | |
| tree | ea08cb1c5d884f03ad5973ab5650e31b95c0b593 /fs/ubifs/commit.c | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| download | kernel-5ede9ddfba424b5dad96e7ccd55607875a64ff6c.tar.gz kernel-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 <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: FUJITA Tomonori <[email protected]>
Cc: Alex Dubov <[email protected]>
Acked-by: Maxim Levitsky <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'fs/ubifs/commit.c')
0 files changed, 0 insertions, 0 deletions