Commit ca31807b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: davinci: remove include/mach/ subdirectory 



The files in include/mach are only used from mach/davinci,
so they are no longer needed in the traditional location.

Move them to arch/arm/mach-davinci/ and drop the logic for
the special include path.

The mach/uncompress.h file is not used at all and can just
be removed.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6d9230ed

arch/arm/mach-davinci/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ 
# Makefile for the linux kernel.

#

#



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



#

# Common objects

obj-y 					:= serial.o usb.o common.o sram.o

arch/arm/mach-davinci/board-da830-evm.c

+3 −4
Original line number Diff line number Diff line
@@ -36,10 +36,9 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/common.h>

#include <mach/mux.h>

#include <mach/da8xx.h>



#include "common.h"

#include "mux.h"

#include "da8xx.h"

#include "irqs.h"



#define DA830_EVM_PHY_ID		""

arch/arm/mach-davinci/board-da850-evm.c

+3 −4
Original line number Diff line number Diff line
@@ -43,10 +43,9 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/flash.h>



#include <mach/common.h>

#include <mach/da8xx.h>

#include <mach/mux.h>



#include "common.h"

#include "da8xx.h"

#include "mux.h"

#include "irqs.h"

#include "sram.h"

arch/arm/mach-davinci/board-dm355-evm.c

+2 −3
Original line number Diff line number Diff line
@@ -33,9 +33,8 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/serial.h>

#include <mach/common.h>



#include "serial.h"

#include "common.h"

#include "davinci.h"



/* NOTE:  this is geared for the standard config, with a socketed

arch/arm/mach-davinci/board-dm355-leopard.c

+2 −3
Original line number Diff line number Diff line
@@ -27,9 +27,8 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/common.h>

#include <mach/serial.h>



#include "common.h"

#include "serial.h"

#include "davinci.h"



/* NOTE:  this is geared for the standard config, with a socketed