Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / drivers / video / exynos / exynos_dp_lowlevel.c

diff --git a/drivers/video/exynos/exynos_dp_lowlevel.c b/drivers/video/exynos/exynos_dp_lowlevel.c
index f9784738bb959d4db604b9d01d69594e0eca9a42..3f9a0e12fcd642cdb94fbb90749fb7481973b2d7 100644 (file)
--- a/drivers/video/exynos/exynos_dp_lowlevel.c
+++ b/drivers/video/exynos/exynos_dp_lowlevel.c
@@ -13,12 +13,10 @@
 #include <asm/arch/dp_info.h>
 #include <asm/arch/dp.h>
 #include <fdtdec.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 #include "exynos_dp_lowlevel.h"
 
 /* Declare global data pointer */
-DECLARE_GLOBAL_DATA_PTR;
-
 static void exynos_dp_enable_video_input(struct exynos_dp *dp_regs,
                                         unsigned int enable)
 {
@@ -881,11 +879,7 @@ void exynos_dp_set_lane_count(struct exynos_dp *dp_regs, unsigned char count)
 
 unsigned int exynos_dp_get_lane_count(struct exynos_dp *dp_regs)
 {
-       unsigned int reg;
-
-       reg = readl(&dp_regs->lane_count_set);
-
-       return reg;
+       return readl(&dp_regs->lane_count_set);
 }
 
 unsigned char exynos_dp_get_lanex_pre_emphasis(struct exynos_dp *dp_regs,