lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: EMMA: Move <asm/emma2rh> to <asm/emma> dir

Browse Source 
We'll put all EMMA related headers there in the future.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Shinya Kuribayashi
2008-10-24 01:30:20 +09:00
committed by Ralf Baechle
parent f27655e341
commit d91f2cbe69
13 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/emma/common/irq.c
View File

@@ -32,7 +32,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
/* /*
* the first level int-handler will jump here if it is a emma2rh irq * the first level int-handler will jump here if it is a emma2rh irq

2
arch/mips/emma/common/irq_emma2rh.c
View File

@@ -36,7 +36,7 @@
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
/* number of total irqs supported by EMMA2RH */ /* number of total irqs supported by EMMA2RH */
#define NUM_EMMA2RH_IRQ 96 #define NUM_EMMA2RH_IRQ 96

2
arch/mips/emma/common/prom.c
View File

@@ -29,7 +29,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
const char *get_system_type(void) const char *get_system_type(void)
{ {

2
arch/mips/emma/markeins/irq.c
View File

@@ -36,7 +36,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
/* /*
* IRQ mapping * IRQ mapping

2
arch/mips/emma/markeins/irq_markeins.c
View File

@@ -28,7 +28,7 @@
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
static int emma2rh_sw_irq_base = -1; static int emma2rh_sw_irq_base = -1;
static int emma2rh_gpio_irq_base = -1; static int emma2rh_gpio_irq_base = -1;

2
arch/mips/emma/markeins/led.c
View File

@@ -21,7 +21,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/string.h> #include <linux/string.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
const unsigned long clear = 0x20202020; const unsigned long clear = 0x20202020;

2
arch/mips/emma/markeins/platform.c
View File

@@ -36,7 +36,7 @@
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
#define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */ #define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */

2
arch/mips/emma/markeins/setup.c
View File

@@ -29,7 +29,7 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/reboot.h> #include <asm/reboot.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
#define USE_CPU_COUNTER_TIMER /* whether we use cpu counter */ #define USE_CPU_COUNTER_TIMER /* whether we use cpu counter */

10
arch/mips/include/asm/emma2rh/emma2rh.h → arch/mips/include/asm/emma/emma2rh.h
View File

@@ -1,5 +1,5 @@
/* /*
* include/asm-mips/emma2rh/emma2rh.h * arch/mips/include/asm/emma/emma2rh.h
* This file is EMMA2RH common header. * This file is EMMA2RH common header.
* *
* Copyright (C) NEC Electronics Corporation 2005-2006 * Copyright (C) NEC Electronics Corporation 2005-2006
@@ -21,8 +21,8 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __ASM_EMMA2RH_EMMA2RH_H #ifndef __ASM_EMMA_EMMA2RH_H
#define __ASM_EMMA2RH_EMMA2RH_H #define __ASM_EMMA_EMMA2RH_H
#include <irq.h> #include <irq.h>
@@ -325,9 +325,9 @@ static inline u8 emma2rh_in8(u32 offset)
* include the board dependent part * include the board dependent part
*/ */
#ifdef CONFIG_NEC_MARKEINS #ifdef CONFIG_NEC_MARKEINS
#include <asm/emma2rh/markeins.h> #include <asm/emma/markeins.h>
#else #else
#error "Unknown EMMA2RH board!" #error "Unknown EMMA2RH board!"
#endif #endif
#endif /* __ASM_EMMA2RH_EMMA2RH_H */ #endif /* __ASM_EMMA_EMMA2RH_H */

0
arch/mips/include/asm/emma2rh/markeins.h → arch/mips/include/asm/emma/markeins.h
View File

2
arch/mips/pci/fixup-emma2rh.c
View File

@@ -30,7 +30,7 @@
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
#define EMMA2RH_PCI_HOST_SLOT 0x09 #define EMMA2RH_PCI_HOST_SLOT 0x09
#define EMMA2RH_USB_SLOT 0x03 #define EMMA2RH_USB_SLOT 0x03

2
arch/mips/pci/ops-emma2rh.c
View File

@@ -30,7 +30,7 @@
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/debug.h> #include <asm/debug.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
#define RTABORT (0x1<<9) #define RTABORT (0x1<<9)
#define RMABORT (0x1<<10) #define RMABORT (0x1<<10)

2
arch/mips/pci/pci-emma2rh.c
View File

@@ -30,7 +30,7 @@
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/emma2rh/emma2rh.h> #include <asm/emma/emma2rh.h>
static struct resource pci_io_resource = { static struct resource pci_io_resource = {
.name = "pci IO space", .name = "pci IO space",