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

Commit 365480d6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'depends/omap-cleanup-headers-usb' into next/headers 



Conflicts resolved same as Tony did in his later dependent branch:

	arch/arm/mach-omap1/clock.c
	arch/arm/mach-omap2/board-2430sdp.c
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-cm-t35.c
	arch/arm/mach-omap2/board-igep0020.c
	arch/arm/mach-omap2/board-ldp.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/board-overo.c
	arch/arm/mach-omap2/board-rm680.c
	arch/arm/mach-omap2/board-rx51.c
	arch/arm/mach-omap2/twl-common.c
	arch/arm/mach-omap2/usb-host.c
	arch/arm/mach-omap2/usb-musb.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1c7ebf17 e8c4a7ac

arch/arm/mach-omap1/clock.c

+1 −3
Original line number Diff line number Diff line
@@ -22,13 +22,11 @@ 


#include <asm/mach-types.h>



#include "soc.h"

#include <plat/usb.h>



#include <mach/hardware.h>



#include "../plat-omap/sram.h"



#include "soc.h"

#include "iomap.h"

#include "clock.h"

#include "opp.h"

arch/arm/mach-omap2/board-2430sdp.c

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


#include "common.h"

#include "gpmc.h"

#include <plat/usb.h>

#include "gpmc-smc91x.h"



#include <video/omapdss.h>

arch/arm/mach-omap2/board-3430sdp.c

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

#include <asm/mach/map.h>



#include <plat/usb.h>

#include "common.h"

#include <plat-omap/dma-omap.h>

#include <video/omapdss.h>

arch/arm/mach-omap2/board-3630sdp.c

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


#include "common.h"

#include "gpmc-smc91x.h"

#include <plat/usb.h>



#include "board-zoom.h"

arch/arm/mach-omap2/board-4430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/leds.h>

#include <linux/leds_pwm.h>

#include <linux/platform_data/omap4-keypad.h>

#include <linux/usb/musb.h>



#include <asm/hardware/gic.h>

#include <asm/mach-types.h>
@@ -34,7 +35,6 @@ 
#include <asm/mach/map.h>



#include "common.h"

#include <plat/usb.h>

#include "omap4-keypad.h"

#include <video/omapdss.h>

#include <video/omap-panel-nokia-dsi.h>