xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers

Browse Source 
Conflicts:
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/gpmc.c
	drivers/media/platform/omap/omap_vout.c
	drivers/media/platform/omap/omap_vout_vrfb.c
This commit is contained in:
Tony Lindgren
2012-10-17 11:21:34 -07:00
parent 46cddc01aa 3e6ece13d9
commit 6832c95599
34 changed files with 499 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/io.c
View File

@@ -26,7 +26,6 @@
#include <asm/mach/map.h>
#include <plat/sram.h>
#include <plat/sdrc.h>
#include <plat/serial.h>
#include <plat/omap-pm.h>
#include <plat/omap_hwmod.h>
@@ -43,6 +42,7 @@
#include "clock2xxx.h"
#include "clock3xxx.h"
#include "clock44xx.h"
#include "sdrc.h"
/*
* The machine specific code may provide the extra mapping besides the