From d91f2cbe698cf70b50099343dac1ec8061bfd045 Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Fri, 24 Oct 2008 01:30:20 +0900 Subject: [PATCH] MIPS: EMMA: Move to dir We'll put all EMMA related headers there in the future. Signed-off-by: Shinya Kuribayashi Signed-off-by: Ralf Baechle --- arch/mips/emma/common/irq.c | 2 +- arch/mips/emma/common/irq_emma2rh.c | 2 +- arch/mips/emma/common/prom.c | 2 +- arch/mips/emma/markeins/irq.c | 2 +- arch/mips/emma/markeins/irq_markeins.c | 2 +- arch/mips/emma/markeins/led.c | 2 +- arch/mips/emma/markeins/platform.c | 2 +- arch/mips/emma/markeins/setup.c | 2 +- arch/mips/include/asm/{emma2rh => emma}/emma2rh.h | 10 +++++----- arch/mips/include/asm/{emma2rh => emma}/markeins.h | 0 arch/mips/pci/fixup-emma2rh.c | 2 +- arch/mips/pci/ops-emma2rh.c | 2 +- arch/mips/pci/pci-emma2rh.c | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) rename arch/mips/include/asm/{emma2rh => emma}/emma2rh.h (98%) rename arch/mips/include/asm/{emma2rh => emma}/markeins.h (100%) diff --git a/arch/mips/emma/common/irq.c b/arch/mips/emma/common/irq.c index 91cbd959ab67..4158f808aa8e 100644 --- a/arch/mips/emma/common/irq.c +++ b/arch/mips/emma/common/irq.c @@ -32,7 +32,7 @@ #include #include -#include +#include /* * the first level int-handler will jump here if it is a emma2rh irq diff --git a/arch/mips/emma/common/irq_emma2rh.c b/arch/mips/emma/common/irq_emma2rh.c index 96df37b77759..23ac959ce43c 100644 --- a/arch/mips/emma/common/irq_emma2rh.c +++ b/arch/mips/emma/common/irq_emma2rh.c @@ -36,7 +36,7 @@ #include -#include +#include /* number of total irqs supported by EMMA2RH */ #define NUM_EMMA2RH_IRQ 96 diff --git a/arch/mips/emma/common/prom.c b/arch/mips/emma/common/prom.c index 97bf29e755a0..120f53fbdb45 100644 --- a/arch/mips/emma/common/prom.c +++ b/arch/mips/emma/common/prom.c @@ -29,7 +29,7 @@ #include #include -#include +#include const char *get_system_type(void) { diff --git a/arch/mips/emma/markeins/irq.c b/arch/mips/emma/markeins/irq.c index 6bcf6a06367a..dcb939205be7 100644 --- a/arch/mips/emma/markeins/irq.c +++ b/arch/mips/emma/markeins/irq.c @@ -36,7 +36,7 @@ #include #include -#include +#include /* * IRQ mapping diff --git a/arch/mips/emma/markeins/irq_markeins.c b/arch/mips/emma/markeins/irq_markeins.c index fba5c156f472..bbe0d711f00f 100644 --- a/arch/mips/emma/markeins/irq_markeins.c +++ b/arch/mips/emma/markeins/irq_markeins.c @@ -28,7 +28,7 @@ #include #include -#include +#include static int emma2rh_sw_irq_base = -1; static int emma2rh_gpio_irq_base = -1; diff --git a/arch/mips/emma/markeins/led.c b/arch/mips/emma/markeins/led.c index b65254c1bfe9..377a181b6561 100644 --- a/arch/mips/emma/markeins/led.c +++ b/arch/mips/emma/markeins/led.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include const unsigned long clear = 0x20202020; diff --git a/arch/mips/emma/markeins/platform.c b/arch/mips/emma/markeins/platform.c index fb9cda253ab0..88e87f6b3442 100644 --- a/arch/mips/emma/markeins/platform.c +++ b/arch/mips/emma/markeins/platform.c @@ -36,7 +36,7 @@ #include #include -#include +#include #define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */ diff --git a/arch/mips/emma/markeins/setup.c b/arch/mips/emma/markeins/setup.c index b6a23ad539f8..67f456500084 100644 --- a/arch/mips/emma/markeins/setup.c +++ b/arch/mips/emma/markeins/setup.c @@ -29,7 +29,7 @@ #include #include -#include +#include #define USE_CPU_COUNTER_TIMER /* whether we use cpu counter */ diff --git a/arch/mips/include/asm/emma2rh/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h similarity index 98% rename from arch/mips/include/asm/emma2rh/emma2rh.h rename to arch/mips/include/asm/emma/emma2rh.h index 5d79669b3b73..a41f84e9bc4e 100644 --- a/arch/mips/include/asm/emma2rh/emma2rh.h +++ b/arch/mips/include/asm/emma/emma2rh.h @@ -1,5 +1,5 @@ /* - * include/asm-mips/emma2rh/emma2rh.h + * arch/mips/include/asm/emma/emma2rh.h * This file is EMMA2RH common header. * * Copyright (C) NEC Electronics Corporation 2005-2006 @@ -21,8 +21,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __ASM_EMMA2RH_EMMA2RH_H -#define __ASM_EMMA2RH_EMMA2RH_H +#ifndef __ASM_EMMA_EMMA2RH_H +#define __ASM_EMMA_EMMA2RH_H #include @@ -325,9 +325,9 @@ static inline u8 emma2rh_in8(u32 offset) * include the board dependent part */ #ifdef CONFIG_NEC_MARKEINS -#include +#include #else #error "Unknown EMMA2RH board!" #endif -#endif /* __ASM_EMMA2RH_EMMA2RH_H */ +#endif /* __ASM_EMMA_EMMA2RH_H */ diff --git a/arch/mips/include/asm/emma2rh/markeins.h b/arch/mips/include/asm/emma/markeins.h similarity index 100% rename from arch/mips/include/asm/emma2rh/markeins.h rename to arch/mips/include/asm/emma/markeins.h diff --git a/arch/mips/pci/fixup-emma2rh.c b/arch/mips/pci/fixup-emma2rh.c index 846eae9cdd05..fba5aad00d51 100644 --- a/arch/mips/pci/fixup-emma2rh.c +++ b/arch/mips/pci/fixup-emma2rh.c @@ -30,7 +30,7 @@ #include -#include +#include #define EMMA2RH_PCI_HOST_SLOT 0x09 #define EMMA2RH_USB_SLOT 0x03 diff --git a/arch/mips/pci/ops-emma2rh.c b/arch/mips/pci/ops-emma2rh.c index d31bfc6d4150..5947a70b0b7f 100644 --- a/arch/mips/pci/ops-emma2rh.c +++ b/arch/mips/pci/ops-emma2rh.c @@ -30,7 +30,7 @@ #include #include -#include +#include #define RTABORT (0x1<<9) #define RMABORT (0x1<<10) diff --git a/arch/mips/pci/pci-emma2rh.c b/arch/mips/pci/pci-emma2rh.c index 772e283daa63..2df4190232cd 100644 --- a/arch/mips/pci/pci-emma2rh.c +++ b/arch/mips/pci/pci-emma2rh.c @@ -30,7 +30,7 @@ #include -#include +#include static struct resource pci_io_resource = { .name = "pci IO space", -- 2.39.5