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

Commit 48d224d1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of... 

Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/pm2

From Tony Lindgren:
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.

Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.

* tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
  ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
  watchdog: OMAP: fixup for ARM multiplatform support

Conflicts due to surrounding changes in:
	arch/arm/mach-omap2/omap_hwmod_2420_data.c
	arch/arm/mach-omap2/omap_hwmod_2430_data.c

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9121dfca 45c3eb7d

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

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include <asm/mach/map.h>



#include <mach/mux.h>

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

#include <linux/omap-dma.h>

#include <mach/tc.h>

#include <mach/irda.h>

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

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <mach/mux.h>

#include <mach/tc.h>

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

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

#include <linux/omap-dma.h>

#include <mach/flash.h>



#include <mach/hardware.h>

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <mach/flash.h>

#include <mach/mux.h>

#include <mach/tc.h>

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

#include <linux/omap-dma.h>

#include <mach/irda.h>

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

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


#include <mach/flash.h>

#include <mach/mux.h>

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

#include <linux/omap-dma.h>

#include <mach/tc.h>

#include <mach/irda.h>

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

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#include <mach/flash.h>

#include <mach/mux.h>

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

#include <linux/omap-dma.h>

#include <mach/tc.h>

#include <mach/irda.h>

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