Merge tag 'sound-fix-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / include / linux / device-mapper.h

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index b0db857f334b95630a4a05ff5b10a6c8383f0c6c..91acfce74a220010549536edde925ef9e3ec81c0 100644 (file)
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -131,7 +131,7 @@ typedef int (*dm_busy_fn) (struct dm_target *ti);
  * >= 0 : the number of bytes accessible at the address
  */
 typedef long (*dm_direct_access_fn) (struct dm_target *ti, sector_t sector,
-                                    void __pmem **kaddr, pfn_t *pfn, long size);
+                                    void **kaddr, pfn_t *pfn, long size);
 
 void dm_error(const char *message);