Commit 7e0a9e62 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: move mach/*.h into mach directory 



Most of the header files are no longer referenced from outside
arch/arm/mach-omap1, so move them all to that place directly
and change their users to use the new location.

The exceptions are:

- mach/compress.h is used by the core architecture code
- mach/serial.h is used by mach/compress.h

The mach/memory.h is empty and gets removed in the process,
avoiding the need for CONFIG_NEED_MACH_MEMORY_H.

Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent df99e7bb

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ config ARCH_OMAP1 
	select GPIOLIB

	select HAVE_LEGACY_CLK

	select IRQ_DOMAIN

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	help

	  Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)

arch/arm/mach-omap1/ams-delta-fiq-handler.S

+2 −1
Original line number Diff line number Diff line
@@ -13,14 +13,15 @@ 
#include <linux/linkage.h>

#include <linux/platform_data/ams-delta-fiq.h>

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

#include <linux/soc/ti/omap1-io.h>



#include <asm/assembler.h>

#include <asm/irq.h>



#include "hardware.h"

#include "ams-delta-fiq.h"

#include "board-ams-delta.h"

#include "iomap.h"

#include "soc.h"



/*

 * OMAP1510 GPIO related symbol copied from arch/arm/mach-omap1/gpio15xx.c.

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

+2 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ 
#include <linux/platform_device.h>



#include <asm/fiq.h>

#include <linux/soc/ti/omap1-io.h>



#include "hardware.h"

#include "ams-delta-fiq.h"

#include "board-ams-delta.h"

arch/arm/mach-omap1/ams-delta-fiq.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifndef __AMS_DELTA_FIQ_H

#define __AMS_DELTA_FIQ_H



#include <mach/irqs.h>

#include "irqs.h"



/*

 * Interrupt number used for passing control from FIQ to IRQ.

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

+1 −3
Original line number Diff line number Diff line
@@ -36,11 +36,9 @@ 
#include <asm/mach/map.h>



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

#include <mach/mux.h>



#include <mach/hardware.h>

#include "hardware.h"

#include "usb.h"



#include "ams-delta-fiq.h"

#include "board-ams-delta.h"

#include "iomap.h"