memstick: make enable_dma less generic in r592
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Mar 2011 23:24:29 +0000 (16:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Mar 2011 23:24:29 +0000 (16:24 -0700)
commit5ede9ddfba424b5dad96e7ccd55607875a64ff6c
treeea08cb1c5d884f03ad5973ab5650e31b95c0b593
parentc5850150d0b9ae16840c5d9846f9d5a759996a15
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>
drivers/memstick/host/r592.c