Commit 2f2a2132 authored by David Howells's avatar David Howells
Browse files

Separate out the proc- and unit-specific header directories from the general

MN10300 arch headers and place them instead in the same directories as contain
the .c files for the processor and unit implementations.

This permits the symlinks include/asm/proc and include/asm/unit to be
dispensed with.  This does, however, require that #include <asm/proc/xxx.h> be
converted to #include <proc/xxx.h> and similarly for asm/unit -> unit.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent da761661
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#define _ASM_UNIT_SERIAL_H #define _ASM_UNIT_SERIAL_H
#include <asm/cpu-regs.h> #include <asm/cpu-regs.h>
#include <asm/proc/irq.h> #include <proc/irq.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000 #define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm/timer-regs.h> #include <asm/timer-regs.h>
#include <asm/unit/clock.h> #include <unit/clock.h>
/* /*
* jiffies counter specifications * jiffies counter specifications
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/rtc-regs.h> #include <asm/rtc-regs.h>
#include <asm/unit/leds.h> #include <unit/leds.h>
#if 0 #if 0
static const u8 asb2303_led_hex_tbl[16] = { static const u8 asb2303_led_hex_tbl[16] = {
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/timex.h> #include <asm/timex.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/intctl-regs.h> #include <asm/intctl-regs.h>
#include <asm/unit/smc91111.h> #include <unit/smc91111.h>
static struct resource smc91c111_resources[] = { static struct resource smc91c111_resources[] = {
[0] = { [0] = {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define _ASM_UNIT_SERIAL_H #define _ASM_UNIT_SERIAL_H
#include <asm/cpu/cpu-regs.h> #include <asm/cpu/cpu-regs.h>
#include <asm/proc/irq.h> #include <proc/irq.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000 #define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <asm/cpu/timer-regs.h> #include <asm/cpu/timer-regs.h>
#include <asm/unit/clock.h> #include <unit/clock.h>
/* /*
* jiffies counter specifications * jiffies counter specifications
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/cpu/intctl-regs.h> #include <asm/cpu/intctl-regs.h>
#include <asm/cpu/rtc-regs.h> #include <asm/cpu/rtc-regs.h>
#include <asm/unit/leds.h> #include <unit/leds.h>
static const u8 asb2305_led_hex_tbl[16] = { static const u8 asb2305_led_hex_tbl[16] = {
0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0, 0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0,
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/cpu/intctl-regs.h> #include <asm/cpu/intctl-regs.h>
#include <asm/cpu/rtc-regs.h> #include <asm/cpu/rtc-regs.h>
#include <asm/cpu/serial-regs.h> #include <asm/cpu/serial-regs.h>
#include <asm/unit/serial.h> #include <unit/serial.h>
/* /*
* initialise some of the unit hardware before gdbstub is set up * initialise some of the unit hardware before gdbstub is set up
......
...@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, ...@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
* MN10300/AM33 configuration * MN10300/AM33 configuration
*/ */
#include <asm/unit/smc91111.h> #include <unit/smc91111.h>
#else #else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment