diff options
| author | Shinya Kuribayashi <skuribay@ruby.dti.ne.jp> | 2008-10-23 12:30:20 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-10-27 12:18:29 -0400 |
| commit | d91f2cbe698cf70b50099343dac1ec8061bfd045 (patch) | |
| tree | 0f419de8abc2b930dc7636d97a7d9dd8d64425f8 /arch/mips/emma/markeins | |
| parent | f27655e34171b0ae9ea5a0aadae894e817f0f875 (diff) | |
MIPS: EMMA: Move <asm/emma2rh> to <asm/emma> dir
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>
Diffstat (limited to 'arch/mips/emma/markeins')
| -rw-r--r-- | arch/mips/emma/markeins/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/irq_markeins.c | 2 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/led.c | 2 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/platform.c | 2 | ||||
| -rw-r--r-- | arch/mips/emma/markeins/setup.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/emma/markeins/irq.c b/arch/mips/emma/markeins/irq.c index 6bcf6a06367..dcb939205be 100644 --- a/arch/mips/emma/markeins/irq.c +++ b/arch/mips/emma/markeins/irq.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <asm/addrspace.h> | 36 | #include <asm/addrspace.h> |
| 37 | #include <asm/bootinfo.h> | 37 | #include <asm/bootinfo.h> |
| 38 | 38 | ||
| 39 | #include <asm/emma2rh/emma2rh.h> | 39 | #include <asm/emma/emma2rh.h> |
| 40 | 40 | ||
| 41 | /* | 41 | /* |
| 42 | * IRQ mapping | 42 | * IRQ mapping |
diff --git a/arch/mips/emma/markeins/irq_markeins.c b/arch/mips/emma/markeins/irq_markeins.c index fba5c156f47..bbe0d711f00 100644 --- a/arch/mips/emma/markeins/irq_markeins.c +++ b/arch/mips/emma/markeins/irq_markeins.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #include <linux/ptrace.h> | 28 | #include <linux/ptrace.h> |
| 29 | 29 | ||
| 30 | #include <asm/debug.h> | 30 | #include <asm/debug.h> |
| 31 | #include <asm/emma2rh/emma2rh.h> | 31 | #include <asm/emma/emma2rh.h> |
| 32 | 32 | ||
| 33 | static int emma2rh_sw_irq_base = -1; | 33 | static int emma2rh_sw_irq_base = -1; |
| 34 | static int emma2rh_gpio_irq_base = -1; | 34 | static int emma2rh_gpio_irq_base = -1; |
diff --git a/arch/mips/emma/markeins/led.c b/arch/mips/emma/markeins/led.c index b65254c1bfe..377a181b656 100644 --- a/arch/mips/emma/markeins/led.c +++ b/arch/mips/emma/markeins/led.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 24 | #include <asm/emma2rh/emma2rh.h> | 24 | #include <asm/emma/emma2rh.h> |
| 25 | 25 | ||
| 26 | const unsigned long clear = 0x20202020; | 26 | const unsigned long clear = 0x20202020; |
| 27 | 27 | ||
diff --git a/arch/mips/emma/markeins/platform.c b/arch/mips/emma/markeins/platform.c index fb9cda253ab..88e87f6b344 100644 --- a/arch/mips/emma/markeins/platform.c +++ b/arch/mips/emma/markeins/platform.c | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <asm/reboot.h> | 36 | #include <asm/reboot.h> |
| 37 | #include <asm/traps.h> | 37 | #include <asm/traps.h> |
| 38 | 38 | ||
| 39 | #include <asm/emma2rh/emma2rh.h> | 39 | #include <asm/emma/emma2rh.h> |
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | #define I2C_EMMA2RH "emma2rh-iic" /* must be in sync with IIC driver */ | 42 | #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 b6a23ad539f..67f45650008 100644 --- a/arch/mips/emma/markeins/setup.c +++ b/arch/mips/emma/markeins/setup.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <asm/time.h> | 29 | #include <asm/time.h> |
| 30 | #include <asm/reboot.h> | 30 | #include <asm/reboot.h> |
| 31 | 31 | ||
| 32 | #include <asm/emma2rh/emma2rh.h> | 32 | #include <asm/emma/emma2rh.h> |
| 33 | 33 | ||
| 34 | #define USE_CPU_COUNTER_TIMER /* whether we use cpu counter */ | 34 | #define USE_CPU_COUNTER_TIMER /* whether we use cpu counter */ |
| 35 | 35 | ||