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

Commit 25c7d49e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Make omap_device local to mach-omap2 



Let's make omap_device local to mach-omap2 for
ARM common zImage support.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 622297fd

arch/arm/mach-omap1/pm_bus.c

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

#include <linux/err.h>



#include <plat/omap_device.h>

#include <plat/omap-pm.h>



#ifdef CONFIG_PM_RUNTIME

arch/arm/mach-omap2/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ 


# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o



# INTCPS IP block support - XXX should be moved to drivers/

obj-$(CONFIG_ARCH_OMAP2)		+= irq.o

arch/arm/mach-omap2/am35xx-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/err.h>

#include <linux/davinci_emac.h>

#include <asm/system.h>

#include <plat/omap_device.h>

#include "omap_device.h"

#include "am35xx.h"

#include "control.h"

#include "am35xx-emac.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "gpmc.h"

#include <linux/platform_data/mtd-nand-omap2.h>

#include <plat/usb.h>

#include <plat/omap_device.h>

#include "omap_device.h"



#include "mux.h"

#include "hsmmc.h"

arch/arm/mach-omap2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "iomap.h"

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

#include <plat/omap_hwmod.h>

#include <plat/omap_device.h>

#include "omap_device.h"

#include "omap4-keypad.h"



#include "soc.h"