Merge branch 'ioat' into dmaengine

[firefly-linux-kernel-4.4.55.git] / drivers / video / imsttfb.c

diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 04696f93dfc93e3521a0448e4eec354bf09d0994..efb2c10656b0a89aa88d23276d47926805bbb4b2 100644 (file)
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -21,7 +21,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -1478,7 +1477,7 @@ imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        
        dp = pci_device_to_OF_node(pdev);
        if(dp)
-               printk(KERN_INFO "%s: OF name %s\n",__FUNCTION__, dp->name);
+               printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name);
        else
                printk(KERN_ERR "imsttfb: no OF node for pci device\n");
 #endif /* CONFIG_PPC_OF */