Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e83cd7c authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

Merge branch 'v3.7-for-florian' of... 

Merge branch 'v3.7-for-florian' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fbdev-next
parents 75435c74 a44cf75d

arch/arm/mach-exynos/mach-nuri.c

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <drm/exynos_drm.h>



#include <video/platform_lcd.h>

#include <video/samsung_fimd.h>

#include <media/m5mols.h>

#include <media/s5k6aa.h>

#include <media/s5p_fimc.h>
@@ -39,7 +40,6 @@ 
#include <asm/mach-types.h>



#include <plat/adc.h>

#include <plat/regs-fb-v4.h>

#include <plat/regs-serial.h>

#include <plat/cpu.h>

#include <plat/devs.h>

arch/arm/mach-exynos/mach-origen.c

+1 −1
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 
#include <asm/mach-types.h>



#include <video/platform_lcd.h>

#include <video/samsung_fimd.h>



#include <plat/regs-serial.h>

#include <plat/regs-fb-v4.h>

#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/sdhci.h>

arch/arm/mach-exynos/mach-smdk4x12.c

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/hardware/gic.h>

#include <asm/mach-types.h>



#include <video/samsung_fimd.h>

#include <plat/backlight.h>

#include <plat/clock.h>

#include <plat/cpu.h>
@@ -35,7 +36,6 @@ 
#include <plat/iic.h>

#include <plat/keypad.h>

#include <plat/mfc.h>

#include <plat/regs-fb.h>

#include <plat/regs-serial.h>

#include <plat/sdhci.h>

arch/arm/mach-exynos/mach-smdkv310.c

+1 −1
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ 
#include <asm/mach-types.h>



#include <video/platform_lcd.h>

#include <video/samsung_fimd.h>

#include <plat/regs-serial.h>

#include <plat/regs-srom.h>

#include <plat/regs-fb-v4.h>

#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/fb.h>

arch/arm/mach-exynos/mach-universal_c210.c

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <asm/hardware/gic.h>

#include <asm/mach-types.h>



#include <video/samsung_fimd.h>

#include <plat/regs-serial.h>

#include <plat/clock.h>

#include <plat/cpu.h>
@@ -39,7 +40,6 @@ 
#include <plat/fb.h>

#include <plat/mfc.h>

#include <plat/sdhci.h>

#include <plat/regs-fb-v4.h>

#include <plat/fimc-core.h>

#include <plat/s5p-time.h>

#include <plat/camport.h>