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

Commit 6832c955 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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

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
parents 46cddc01 3e6ece13

arch/arm/mach-omap2/board-omap3logic.c

+2 −3
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include "gpmc-smsc911x.h"

#include "gpmc.h"

#include <plat/sdrc.h>

#include <plat/usb.h>



#include "common.h"
@@ -44,6 +41,8 @@ 
#include "hsmmc.h"

#include "control.h"

#include "common-board-devices.h"

#include "gpmc.h"

#include "gpmc-smsc911x.h"



#define OMAP3LOGIC_SMSC911X_CS			1

arch/arm/mach-omap2/clkt2xxx_dpllcore.c

+1 −1
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 


#include <plat/clock.h>

#include <plat/sram.h>

#include <plat/sdrc.h>



#include "clock.h"

#include "clock2xxx.h"

#include "opp2xxx.h"

#include "cm2xxx_3xxx.h"

#include "cm-regbits-24xx.h"

#include "sdrc.h"



/* #define DOWN_VARIABLE_DPLL 1 */		/* Experimental */

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#include <plat/clock.h>

#include <plat/sram.h>

#include <plat/sdrc.h>



#include "soc.h"

#include "clock.h"
@@ -43,6 +42,7 @@ 
#include "opp2xxx.h"

#include "cm2xxx_3xxx.h"

#include "cm-regbits-24xx.h"

#include "sdrc.h"



const struct prcm_config *curr_prcm_set;

const struct prcm_config *rate_table;

arch/arm/mach-omap2/clkt34xx_dpll3m2.c

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include <plat/clock.h>

#include <plat/sram.h>

#include <plat/sdrc.h>



#include "clock.h"

#include "clock3xxx.h"

arch/arm/mach-omap2/control.c

+1 −3
Original line number Diff line number Diff line 
/*

 * OMAP2/3 System Control Module register access

 *

 * Copyright (C) 2007 Texas Instruments, Inc.

 * Copyright (C) 2007, 2012 Texas Instruments, Inc.

 * Copyright (C) 2007 Nokia Corporation

 *

 * Written by Paul Walmsley
@@ -15,8 +15,6 @@ 
#include <linux/kernel.h>

#include <linux/io.h>



#include <plat/sdrc.h>



#include "soc.h"

#include "iomap.h"

#include "common.h"