parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP

[karo-tx-linux.git] / drivers / block / brd.c

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 7bd76639544c18d78d8b4ed87fb6befb7dcf685d..e8e38faeafd8774d423366424ee60cf33c99338f 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -319,7 +319,7 @@ out:
 
 #ifdef CONFIG_BLK_DEV_XIP
 static int brd_direct_access (struct block_device *bdev, sector_t sector,
-                       unsigned long *data)
+                       void **kaddr, unsigned long *pfn)
 {
        struct brd_device *brd = bdev->bd_disk->private_data;
        struct page *page;
@@ -333,7 +333,8 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector,
        page = brd_insert_page(brd, sector);
        if (!page)
                return -ENOMEM;
-       *data = (unsigned long)page_address(page);
+       *kaddr = page_address(page);
+       *pfn = page_to_pfn(page);
 
        return 0;
 }