Commit 3f96a2d9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and... 

Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2
parents 6887a413 472fd540 c59b537d 6fd8246b

arch/arm/mach-omap1/board-ams-delta.c

+1 −1
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ 
#include <plat/board-ams-delta.h>

#include <plat/keypad.h>

#include <plat/mux.h>

#include <plat/usb.h>

#include <plat/board.h>



#include <mach/hardware.h>

#include <mach/ams-delta-fiq.h>

#include <mach/camera.h>

#include <mach/usb.h>



#include "iomap.h"

#include "common.h"

arch/arm/mach-omap1/board-generic.c

+3 −1
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ 
#include <asm/mach/map.h>



#include <plat/mux.h>

#include <plat/usb.h>

#include <plat/board.h>



#include <mach/usb.h>



#include "common.h"



/* assume no Mini-AB port */

arch/arm/mach-omap1/board-h2.c

+1 −1
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ 
#include <plat/dma.h>

#include <plat/tc.h>

#include <plat/irda.h>

#include <plat/usb.h>

#include <plat/keypad.h>

#include <plat/flash.h>



#include <mach/hardware.h>

#include <mach/usb.h>



#include "common.h"

#include "board-h2.h"

arch/arm/mach-omap1/board-h3.c

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


#include <plat/mux.h>

#include <plat/tc.h>

#include <plat/usb.h>

#include <plat/keypad.h>

#include <plat/dma.h>

#include <plat/flash.h>



#include <mach/hardware.h>

#include <mach/irqs.h>

#include <mach/usb.h>



#include "common.h"

#include "board-h3.h"

arch/arm/mach-omap1/board-htcherald.c

+1 −1
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ 
#include <plat/omap7xx.h>

#include <plat/board.h>

#include <plat/keypad.h>

#include <plat/usb.h>

#include <plat/mmc.h>



#include <mach/irqs.h>

#include <mach/usb.h>



#include "common.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE