Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / drivers / fpga / dfl-fme-region.c

diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl-fme-region.c
index ec134ec..1eeb42a 100644 (file)
--- a/drivers/fpga/dfl-fme-region.c
+++ b/drivers/fpga/dfl-fme-region.c
@@ -64,7 +64,7 @@ eprobe_mgr_put:
 
 static int fme_region_remove(struct platform_device *pdev)
 {
-       struct fpga_region *region = dev_get_drvdata(&pdev->dev);
+       struct fpga_region *region = platform_get_drvdata(pdev);
        struct fpga_manager *mgr = region->mgr;
 
        fpga_region_unregister(region);