Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index ff75d70f7285..a87489d007dc 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -143,12 +143,12 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)
  */
 static long
 axon_ram_direct_access(struct block_device *device, sector_t sector,
-                       void __pmem **kaddr, pfn_t *pfn, long size)
+                       void **kaddr, pfn_t *pfn, long size)
 {
         struct axon_ram_bank *bank = device->bd_disk->private_data;
         loff_t offset = (loff_t)sector << AXON_RAM_SECTOR_SHIFT;
 
-        *kaddr = (void __pmem __force *) bank->io_addr + offset;
+        *kaddr = (void *) bank->io_addr + offset;
         *pfn = phys_to_pfn_t(bank->ph_addr + offset, PFN_DEV);
         return bank->size - offset;
 }