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

Commit 6f088f1d authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Lennert Buytenhek
Browse files

[ARM] Move include/asm-arm/plat-orion to arch/arm/plat-orion/include/plat 



This patch performs the equivalent include directory shuffle for
plat-orion, and fixes up all users.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent a09e64fb

arch/arm/mach-kirkwood/common.c

+4 −4
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <mach/kirkwood.h>

#include <asm/plat-orion/cache-feroceon-l2.h>

#include <asm/plat-orion/ehci-orion.h>

#include <asm/plat-orion/orion_nand.h>

#include <asm/plat-orion/time.h>

#include <plat/cache-feroceon-l2.h>

#include <plat/ehci-orion.h>

#include <plat/orion_nand.h>

#include <plat/time.h>

#include "common.h"



/*****************************************************************************

arch/arm/mach-kirkwood/irq.c

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

#include <linux/irq.h>

#include <linux/io.h>

#include <asm/plat-orion/irq.h>

#include <plat/irq.h>

#include "common.h"



void __init kirkwood_init_irq(void)

arch/arm/mach-kirkwood/pcie.c

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

#include <linux/mbus.h>

#include <asm/mach/pci.h>

#include <asm/plat-orion/pcie.h>

#include <plat/pcie.h>

#include "common.h"

arch/arm/mach-kirkwood/rd88f6281-setup.c

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

#include <asm/mach/pci.h>

#include <mach/kirkwood.h>

#include <asm/plat-orion/orion_nand.h>

#include <plat/orion_nand.h>

#include "common.h"



static struct mtd_partition rd88f6281_nand_parts[] = {

arch/arm/mach-loki/common.c

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <mach/loki.h>

#include <asm/plat-orion/orion_nand.h>

#include <asm/plat-orion/time.h>

#include <plat/orion_nand.h>

#include <plat/time.h>

#include "common.h"



/*****************************************************************************