These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / video / fbdev / atmel_lcdfb.c

diff --git a/kernel/drivers/video/fbdev/atmel_lcdfb.c b/kernel/drivers/video/fbdev/atmel_lcdfb.c
index 94a8d04..19eb42b 100644 (file)
--- a/kernel/drivers/video/fbdev/atmel_lcdfb.c
+++ b/kernel/drivers/video/fbdev/atmel_lcdfb.c
@@ -19,7 +19,6 @@
 #include <linux/backlight.h>
 #include <linux/gfp.h>
 #include <linux/module.h>
-#include <linux/platform_data/atmel.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
@@ -999,7 +998,7 @@ static const char *atmel_lcdfb_wiring_modes[] = {
        [ATMEL_LCDC_WIRING_RGB] = "RGB",
 };
 
-const int atmel_lcdfb_get_of_wiring_modes(struct device_node *np)
+static int atmel_lcdfb_get_of_wiring_modes(struct device_node *np)
 {
        const char *mode;
        int err, i;
@@ -1266,7 +1265,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                        goto stop_clk;
                }
 
-               info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
+               info->screen_base = ioremap_wc(info->fix.smem_start,
+                                              info->fix.smem_len);
                if (!info->screen_base) {
                        ret = -ENOMEM;
                        goto release_intmem;