Skip to content

Commit d848223

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: Separate out the proc- and unit-specific header directories from the general Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
2 parents 5de4c51 + 2f2a213 commit d848223

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+31
-65
lines changed

‎arch/mn10300/Makefile

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO
9494
KBUILD_AFLAGS += -Wa,--gdwarf2
9595
endif
9696

97-
###################################################################################################
9897
#
99-
# juggle some symlinks in the MN10300 asm include dir
98+
# include the appropriate processor- and unit-specific headers
10099
#
101-
# Update machine proc and unit symlinks if something which affects
102-
# them changed. We use .proc / .unit to indicate when they were
103-
# updated last, otherwise make uses the target directory mtime.
104-
#
105-
###################################################################################################
106-
107-
# processor specific definitions
108-
include/asm-mn10300/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf
109-
@echo ' SYMLINK include/asm-mn10300/proc -> include/asm-mn10300/proc-$(PROCESSOR)'
110-
ifneq ($(KBUILD_SRC),)
111-
$(Q)mkdir -p include/asm-mn10300
112-
$(Q)ln -fsn $(srctree)/include/asm-mn10300/proc-$(PROCESSOR) include/asm-mn10300/proc
113-
else
114-
$(Q)ln -fsn proc-$(PROCESSOR) include/asm-mn10300/proc
115-
endif
116-
@touch $@
117-
118-
CLEAN_FILES += include/asm-mn10300/proc include/asm-mn10300/.proc
119-
120-
prepare: include/asm-mn10300/.proc
121-
122-
# unit specific definitions
123-
include/asm-mn10300/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf
124-
@echo ' SYMLINK include/asm-mn10300/unit -> include/asm-mn10300/unit-$(UNIT)'
125-
ifneq ($(KBUILD_SRC),)
126-
$(Q)mkdir -p include/asm-mn10300
127-
$(Q)ln -fsn $(srctree)/include/asm-mn10300/unit-$(UNIT) include/asm-mn10300/unit
128-
else
129-
$(Q)ln -fsn unit-$(UNIT) include/asm-mn10300/unit
130-
endif
131-
@touch $@
132-
133-
CLEAN_FILES += include/asm-mn10300/unit include/asm-mn10300/.unit
134-
135-
prepare: include/asm-mn10300/.unit
100+
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include
101+
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include

‎include/asm-mn10300/Kbuild renamed to ‎arch/mn10300/include/asm/Kbuild

File renamed without changes.

‎include/asm-mn10300/atomic.h renamed to ‎arch/mn10300/include/asm/atomic.h

File renamed without changes.

‎include/asm-mn10300/auxvec.h renamed to ‎arch/mn10300/include/asm/auxvec.h

File renamed without changes.

‎include/asm-mn10300/bitops.h renamed to ‎arch/mn10300/include/asm/bitops.h

File renamed without changes.

‎include/asm-mn10300/bug.h renamed to ‎arch/mn10300/include/asm/bug.h

File renamed without changes.

‎include/asm-mn10300/bugs.h renamed to ‎arch/mn10300/include/asm/bugs.h

File renamed without changes.

‎include/asm-mn10300/busctl-regs.h renamed to ‎arch/mn10300/include/asm/busctl-regs.h

File renamed without changes.

‎include/asm-mn10300/byteorder.h renamed to ‎arch/mn10300/include/asm/byteorder.h

File renamed without changes.

‎include/asm-mn10300/cache.h renamed to ‎arch/mn10300/include/asm/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define _ASM_CACHE_H
1414

1515
#include <asm/cpu-regs.h>
16-
#include <asm/proc/cache.h>
16+
#include <proc/cache.h>
1717

1818
#ifndef __ASSEMBLY__
1919
#define L1_CACHE_DISPARITY (L1_CACHE_NENTRIES * L1_CACHE_BYTES)

‎include/asm-mn10300/cacheflush.h renamed to ‎arch/mn10300/include/asm/cacheflush.h

File renamed without changes.

‎include/asm-mn10300/checksum.h renamed to ‎arch/mn10300/include/asm/checksum.h

File renamed without changes.

‎include/asm-mn10300/cpu-regs.h renamed to ‎arch/mn10300/include/asm/cpu-regs.h

File renamed without changes.

‎include/asm-mn10300/cputime.h renamed to ‎arch/mn10300/include/asm/cputime.h

File renamed without changes.

‎include/asm-mn10300/current.h renamed to ‎arch/mn10300/include/asm/current.h

File renamed without changes.

‎include/asm-mn10300/delay.h renamed to ‎arch/mn10300/include/asm/delay.h

File renamed without changes.

‎include/asm-mn10300/device.h renamed to ‎arch/mn10300/include/asm/device.h

File renamed without changes.

‎include/asm-mn10300/div64.h renamed to ‎arch/mn10300/include/asm/div64.h

File renamed without changes.

‎include/asm-mn10300/dma-mapping.h renamed to ‎arch/mn10300/include/asm/dma-mapping.h

File renamed without changes.

‎include/asm-mn10300/dma.h renamed to ‎arch/mn10300/include/asm/dma.h

File renamed without changes.

‎include/asm-mn10300/dmactl-regs.h renamed to ‎arch/mn10300/include/asm/dmactl-regs.h

File renamed without changes.

‎include/asm-mn10300/elf.h renamed to ‎arch/mn10300/include/asm/elf.h

File renamed without changes.

‎include/asm-mn10300/emergency-restart.h renamed to ‎arch/mn10300/include/asm/emergency-restart.h

File renamed without changes.

‎include/asm-mn10300/errno.h renamed to ‎arch/mn10300/include/asm/errno.h

File renamed without changes.

‎include/asm-mn10300/exceptions.h renamed to ‎arch/mn10300/include/asm/exceptions.h

File renamed without changes.

‎include/asm-mn10300/fb.h renamed to ‎arch/mn10300/include/asm/fb.h

File renamed without changes.

‎include/asm-mn10300/fcntl.h renamed to ‎arch/mn10300/include/asm/fcntl.h

File renamed without changes.

‎include/asm-mn10300/fpu.h renamed to ‎arch/mn10300/include/asm/fpu.h

File renamed without changes.

‎include/asm-mn10300/frame.inc renamed to ‎arch/mn10300/include/asm/frame.inc

File renamed without changes.

‎include/asm-mn10300/ftrace.h renamed to ‎arch/mn10300/include/asm/ftrace.h

File renamed without changes.

‎include/asm-mn10300/futex.h renamed to ‎arch/mn10300/include/asm/futex.h

File renamed without changes.

‎include/asm-mn10300/gdb-stub.h renamed to ‎arch/mn10300/include/asm/gdb-stub.h

File renamed without changes.

‎include/asm-mn10300/hardirq.h renamed to ‎arch/mn10300/include/asm/hardirq.h

File renamed without changes.

‎include/asm-mn10300/highmem.h renamed to ‎arch/mn10300/include/asm/highmem.h

File renamed without changes.

‎include/asm-mn10300/hw_irq.h renamed to ‎arch/mn10300/include/asm/hw_irq.h

File renamed without changes.

‎include/asm-mn10300/intctl-regs.h renamed to ‎arch/mn10300/include/asm/intctl-regs.h

File renamed without changes.

‎include/asm-mn10300/io.h renamed to ‎arch/mn10300/include/asm/io.h

File renamed without changes.

‎include/asm-mn10300/ioctl.h renamed to ‎arch/mn10300/include/asm/ioctl.h

File renamed without changes.

‎include/asm-mn10300/ioctls.h renamed to ‎arch/mn10300/include/asm/ioctls.h

File renamed without changes.

‎include/asm-mn10300/ipc.h renamed to ‎arch/mn10300/include/asm/ipc.h

File renamed without changes.

‎include/asm-mn10300/ipcbuf.h renamed to ‎arch/mn10300/include/asm/ipcbuf.h

File renamed without changes.

‎include/asm-mn10300/irq.h renamed to ‎arch/mn10300/include/asm/irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <asm/intctl-regs.h>
1818
#include <asm/reset-regs.h>
19-
#include <asm/proc/irq.h>
19+
#include <proc/irq.h>
2020

2121
/* this number is used when no interrupt has been assigned */
2222
#define NO_IRQ INT_MAX

‎include/asm-mn10300/irq_regs.h renamed to ‎arch/mn10300/include/asm/irq_regs.h

File renamed without changes.

‎include/asm-mn10300/kdebug.h renamed to ‎arch/mn10300/include/asm/kdebug.h

File renamed without changes.

‎include/asm-mn10300/kmap_types.h renamed to ‎arch/mn10300/include/asm/kmap_types.h

File renamed without changes.

‎include/asm-mn10300/kprobes.h renamed to ‎arch/mn10300/include/asm/kprobes.h

File renamed without changes.

‎include/asm-mn10300/linkage.h renamed to ‎arch/mn10300/include/asm/linkage.h

File renamed without changes.

‎include/asm-mn10300/local.h renamed to ‎arch/mn10300/include/asm/local.h

File renamed without changes.

‎include/asm-mn10300/mc146818rtc.h renamed to ‎arch/mn10300/include/asm/mc146818rtc.h

File renamed without changes.

‎include/asm-mn10300/mman.h renamed to ‎arch/mn10300/include/asm/mman.h

File renamed without changes.

‎include/asm-mn10300/mmu.h renamed to ‎arch/mn10300/include/asm/mmu.h

File renamed without changes.

‎include/asm-mn10300/mmu_context.h renamed to ‎arch/mn10300/include/asm/mmu_context.h

File renamed without changes.

‎include/asm-mn10300/module.h renamed to ‎arch/mn10300/include/asm/module.h

File renamed without changes.

‎include/asm-mn10300/msgbuf.h renamed to ‎arch/mn10300/include/asm/msgbuf.h

File renamed without changes.

‎include/asm-mn10300/mutex.h renamed to ‎arch/mn10300/include/asm/mutex.h

File renamed without changes.

‎include/asm-mn10300/nmi.h renamed to ‎arch/mn10300/include/asm/nmi.h

File renamed without changes.

‎include/asm-mn10300/page.h renamed to ‎arch/mn10300/include/asm/page.h

File renamed without changes.

‎include/asm-mn10300/page_offset.h renamed to ‎arch/mn10300/include/asm/page_offset.h

File renamed without changes.

‎include/asm-mn10300/param.h renamed to ‎arch/mn10300/include/asm/param.h

File renamed without changes.

‎include/asm-mn10300/pci.h renamed to ‎arch/mn10300/include/asm/pci.h

File renamed without changes.

‎include/asm-mn10300/percpu.h renamed to ‎arch/mn10300/include/asm/percpu.h

File renamed without changes.

‎include/asm-mn10300/pgalloc.h renamed to ‎arch/mn10300/include/asm/pgalloc.h

File renamed without changes.

‎include/asm-mn10300/pgtable.h renamed to ‎arch/mn10300/include/asm/pgtable.h

File renamed without changes.

‎include/asm-mn10300/pio-regs.h renamed to ‎arch/mn10300/include/asm/pio-regs.h

File renamed without changes.

‎include/asm-mn10300/poll.h renamed to ‎arch/mn10300/include/asm/poll.h

File renamed without changes.

‎include/asm-mn10300/posix_types.h renamed to ‎arch/mn10300/include/asm/posix_types.h

File renamed without changes.

‎include/asm-mn10300/processor.h renamed to ‎arch/mn10300/include/asm/processor.h

File renamed without changes.

‎include/asm-mn10300/ptrace.h renamed to ‎arch/mn10300/include/asm/ptrace.h

File renamed without changes.

‎include/asm-mn10300/reset-regs.h renamed to ‎arch/mn10300/include/asm/reset-regs.h

File renamed without changes.

‎include/asm-mn10300/resource.h renamed to ‎arch/mn10300/include/asm/resource.h

File renamed without changes.

‎include/asm-mn10300/rtc-regs.h renamed to ‎arch/mn10300/include/asm/rtc-regs.h

File renamed without changes.

‎include/asm-mn10300/rtc.h renamed to ‎arch/mn10300/include/asm/rtc.h

File renamed without changes.

‎include/asm-mn10300/scatterlist.h renamed to ‎arch/mn10300/include/asm/scatterlist.h

File renamed without changes.

‎include/asm-mn10300/sections.h renamed to ‎arch/mn10300/include/asm/sections.h

File renamed without changes.

‎include/asm-mn10300/sembuf.h renamed to ‎arch/mn10300/include/asm/sembuf.h

File renamed without changes.

‎include/asm-mn10300/serial-regs.h renamed to ‎arch/mn10300/include/asm/serial-regs.h

File renamed without changes.

‎include/asm-mn10300/serial.h renamed to ‎arch/mn10300/include/asm/serial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
#define RS_TABLE_SIZE
3434
#endif
3535

36-
#include <asm/unit/serial.h>
36+
#include <unit/serial.h>

‎include/asm-mn10300/setup.h renamed to ‎arch/mn10300/include/asm/setup.h

File renamed without changes.

‎include/asm-mn10300/shmbuf.h renamed to ‎arch/mn10300/include/asm/shmbuf.h

File renamed without changes.

‎include/asm-mn10300/shmparam.h renamed to ‎arch/mn10300/include/asm/shmparam.h

File renamed without changes.

‎include/asm-mn10300/sigcontext.h renamed to ‎arch/mn10300/include/asm/sigcontext.h

File renamed without changes.

‎include/asm-mn10300/siginfo.h renamed to ‎arch/mn10300/include/asm/siginfo.h

File renamed without changes.

‎include/asm-mn10300/signal.h renamed to ‎arch/mn10300/include/asm/signal.h

File renamed without changes.

‎include/asm-mn10300/smp.h renamed to ‎arch/mn10300/include/asm/smp.h

File renamed without changes.

‎include/asm-mn10300/socket.h renamed to ‎arch/mn10300/include/asm/socket.h

File renamed without changes.

‎include/asm-mn10300/sockios.h renamed to ‎arch/mn10300/include/asm/sockios.h

File renamed without changes.

‎include/asm-mn10300/spinlock.h renamed to ‎arch/mn10300/include/asm/spinlock.h

File renamed without changes.

‎include/asm-mn10300/stat.h renamed to ‎arch/mn10300/include/asm/stat.h

File renamed without changes.

‎include/asm-mn10300/statfs.h renamed to ‎arch/mn10300/include/asm/statfs.h

File renamed without changes.

‎include/asm-mn10300/string.h renamed to ‎arch/mn10300/include/asm/string.h

File renamed without changes.

‎include/asm-mn10300/swab.h renamed to ‎arch/mn10300/include/asm/swab.h

File renamed without changes.

‎include/asm-mn10300/system.h renamed to ‎arch/mn10300/include/asm/system.h

File renamed without changes.

‎include/asm-mn10300/termbits.h renamed to ‎arch/mn10300/include/asm/termbits.h

File renamed without changes.

‎include/asm-mn10300/termios.h renamed to ‎arch/mn10300/include/asm/termios.h

File renamed without changes.

‎include/asm-mn10300/thread_info.h renamed to ‎arch/mn10300/include/asm/thread_info.h

File renamed without changes.

‎include/asm-mn10300/timer-regs.h renamed to ‎arch/mn10300/include/asm/timer-regs.h

File renamed without changes.

‎include/asm-mn10300/timex.h renamed to ‎arch/mn10300/include/asm/timex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define _ASM_TIMEX_H
1313

1414
#include <asm/hardirq.h>
15-
#include <asm/unit/timex.h>
15+
#include <unit/timex.h>
1616

1717
#define TICK_SIZE (tick_nsec / 1000)
1818

‎include/asm-mn10300/tlb.h renamed to ‎arch/mn10300/include/asm/tlb.h

File renamed without changes.

‎include/asm-mn10300/tlbflush.h renamed to ‎arch/mn10300/include/asm/tlbflush.h

File renamed without changes.

‎include/asm-mn10300/topology.h renamed to ‎arch/mn10300/include/asm/topology.h

File renamed without changes.

‎include/asm-mn10300/types.h renamed to ‎arch/mn10300/include/asm/types.h

File renamed without changes.

‎include/asm-mn10300/uaccess.h renamed to ‎arch/mn10300/include/asm/uaccess.h

File renamed without changes.

‎include/asm-mn10300/ucontext.h renamed to ‎arch/mn10300/include/asm/ucontext.h

File renamed without changes.

‎include/asm-mn10300/unaligned.h renamed to ‎arch/mn10300/include/asm/unaligned.h

File renamed without changes.

‎include/asm-mn10300/unistd.h renamed to ‎arch/mn10300/include/asm/unistd.h

File renamed without changes.

‎include/asm-mn10300/user.h renamed to ‎arch/mn10300/include/asm/user.h

File renamed without changes.

‎include/asm-mn10300/vga.h renamed to ‎arch/mn10300/include/asm/vga.h

File renamed without changes.

‎include/asm-mn10300/xor.h renamed to ‎arch/mn10300/include/asm/xor.h

File renamed without changes.

‎arch/mn10300/kernel/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <asm/intctl-regs.h>
2121
#include <asm/busctl-regs.h>
2222
#include <asm/timer-regs.h>
23-
#include <asm/unit/leds.h>
23+
#include <unit/leds.h>
2424
#include <asm/page.h>
2525
#include <asm/pgtable.h>
2626
#include <asm/errno.h>

‎arch/mn10300/kernel/gdb-io-serial-low.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <asm/thread_info.h>
1919
#include <asm/frame.inc>
2020
#include <asm/intctl-regs.h>
21-
#include <asm/unit/serial.h>
21+
#include <unit/serial.h>
2222

2323
.text
2424

‎arch/mn10300/kernel/gdb-io-serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <asm/gdb-stub.h>
2323
#include <asm/exceptions.h>
2424
#include <asm/serial-regs.h>
25-
#include <asm/unit/serial.h>
25+
#include <unit/serial.h>
2626

2727
/*
2828
* initialise the GDB stub

‎arch/mn10300/kernel/gdb-io-ttysm-low.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <asm/cpu-regs.h>
1919
#include <asm/frame.inc>
2020
#include <asm/intctl-regs.h>
21-
#include <asm/unit/serial.h>
21+
#include <unit/serial.h>
2222
#include "mn10300-serial.h"
2323

2424
.text

‎arch/mn10300/kernel/gdb-io-ttysm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <asm/system.h>
2121
#include <asm/gdb-stub.h>
2222
#include <asm/exceptions.h>
23-
#include <asm/unit/clock.h>
23+
#include <unit/clock.h>
2424
#include "mn10300-serial.h"
2525

2626
#if defined(CONFIG_GDBSTUB_ON_TTYSM0)

‎arch/mn10300/kernel/gdb-stub.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@
136136
#include <asm/cacheflush.h>
137137
#include <asm/serial-regs.h>
138138
#include <asm/busctl-regs.h>
139-
#include <asm/unit/leds.h>
140-
#include <asm/unit/serial.h>
139+
#include <unit/leds.h>
140+
#include <unit/serial.h>
141141

142142
/* define to use F7F7 rather than FF which is subverted by JTAG debugger */
143143
#undef GDBSTUB_USE_F7F7_AS_BREAKPOINT

‎arch/mn10300/kernel/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <asm/pgtable.h>
1818
#include <asm/frame.inc>
1919
#include <asm/param.h>
20-
#include <asm/unit/serial.h>
20+
#include <unit/serial.h>
2121

2222
.section .text.head,"ax"
2323

‎arch/mn10300/kernel/mn10300-serial-low.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <asm/cpu-regs.h>
1919
#include <asm/frame.inc>
2020
#include <asm/timer-regs.h>
21-
#include <asm/proc/cache.h>
22-
#include <asm/unit/timex.h>
21+
#include <proc/cache.h>
22+
#include <unit/timex.h>
2323
#include "mn10300-serial.h"
2424

2525
#define SCxCTR 0x00

‎arch/mn10300/kernel/mn10300-serial.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static const char serial_revdate[] = "2007-11-06";
4141
#include <asm/irq.h>
4242
#include <asm/bitops.h>
4343
#include <asm/serial-regs.h>
44-
#include <asm/unit/timex.h>
44+
#include <unit/timex.h>
4545
#include "mn10300-serial.h"
4646

4747
static inline __attribute__((format(printf, 1, 2)))

‎arch/mn10300/kernel/mn10300-watchdog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <asm/div64.h>
2626
#include <asm/smp.h>
2727
#include <asm/gdb-stub.h>
28-
#include <asm/proc/clock.h>
28+
#include <proc/clock.h>
2929

3030
static DEFINE_SPINLOCK(watchdog_print_lock);
3131
static unsigned int watchdog;

‎arch/mn10300/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <asm/setup.h>
3131
#include <asm/io.h>
3232
#include <asm/smp.h>
33-
#include <asm/proc/proc.h>
33+
#include <proc/proc.h>
3434
#include <asm/busctl-regs.h>
3535
#include <asm/fpu.h>
3636
#include <asm/sections.h>

‎arch/mn10300/kernel/traps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <asm/cacheflush.h>
3838
#include <asm/cpu-regs.h>
3939
#include <asm/busctl-regs.h>
40-
#include <asm/unit/leds.h>
40+
#include <unit/leds.h>
4141
#include <asm/fpu.h>
4242
#include <asm/gdb-stub.h>
4343
#include <asm/sections.h>

‎include/asm-mn10300/proc-mn103e010/cache.h renamed to ‎arch/mn10300/proc-mn103e010/include/proc/cache.h

File renamed without changes.

‎include/asm-mn10300/proc-mn103e010/clock.h renamed to ‎arch/mn10300/proc-mn103e010/include/proc/clock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#ifndef _ASM_PROC_CLOCK_H
1212
#define _ASM_PROC_CLOCK_H
1313

14-
#include <asm/unit/clock.h>
14+
#include <unit/clock.h>
1515

1616
#define MN10300_WDCLK MN10300_IOCLK
1717

‎include/asm-mn10300/proc-mn103e010/irq.h renamed to ‎arch/mn10300/proc-mn103e010/include/proc/irq.h

File renamed without changes.

‎include/asm-mn10300/proc-mn103e010/proc.h renamed to ‎arch/mn10300/proc-mn103e010/include/proc/proc.h

File renamed without changes.

‎include/asm-mn10300/unit-asb2303/clock.h renamed to ‎arch/mn10300/unit-asb2303/include/unit/clock.h

File renamed without changes.

‎include/asm-mn10300/unit-asb2303/leds.h renamed to ‎arch/mn10300/unit-asb2303/include/unit/leds.h

File renamed without changes.

‎include/asm-mn10300/unit-asb2303/serial.h renamed to ‎arch/mn10300/unit-asb2303/include/unit/serial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define _ASM_UNIT_SERIAL_H
1414

1515
#include <asm/cpu-regs.h>
16-
#include <asm/proc/irq.h>
16+
#include <proc/irq.h>
1717
#include <linux/serial_reg.h>
1818

1919
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000

‎include/asm-mn10300/unit-asb2303/smc91111.h renamed to ‎arch/mn10300/unit-asb2303/include/unit/smc91111.h

File renamed without changes.

‎include/asm-mn10300/unit-asb2303/timex.h renamed to ‎arch/mn10300/unit-asb2303/include/unit/timex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#endif /* __ASSEMBLY__ */
1717

1818
#include <asm/timer-regs.h>
19-
#include <asm/unit/clock.h>
19+
#include <unit/clock.h>
2020

2121
/*
2222
* jiffies counter specifications

‎arch/mn10300/unit-asb2303/leds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <asm/processor.h>
1717
#include <asm/intctl-regs.h>
1818
#include <asm/rtc-regs.h>
19-
#include <asm/unit/leds.h>
19+
#include <unit/leds.h>
2020

2121
#if 0
2222
static const u8 asb2303_led_hex_tbl[16] = {

‎arch/mn10300/unit-asb2303/smc91111.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <asm/timex.h>
1919
#include <asm/processor.h>
2020
#include <asm/intctl-regs.h>
21-
#include <asm/unit/smc91111.h>
21+
#include <unit/smc91111.h>
2222

2323
static struct resource smc91c111_resources[] = {
2424
[0] = {

‎include/asm-mn10300/unit-asb2305/clock.h renamed to ‎arch/mn10300/unit-asb2305/include/unit/clock.h

File renamed without changes.

‎include/asm-mn10300/unit-asb2305/leds.h renamed to ‎arch/mn10300/unit-asb2305/include/unit/leds.h

File renamed without changes.

‎include/asm-mn10300/unit-asb2305/serial.h renamed to ‎arch/mn10300/unit-asb2305/include/unit/serial.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#define _ASM_UNIT_SERIAL_H
1313

1414
#include <asm/cpu/cpu-regs.h>
15-
#include <asm/proc/irq.h>
15+
#include <proc/irq.h>
1616
#include <linux/serial_reg.h>
1717

1818
#define SERIAL_PORT0_BASE_ADDRESS 0xA6FB0000

‎include/asm-mn10300/unit-asb2305/timex.h renamed to ‎arch/mn10300/unit-asb2305/include/unit/timex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#endif /* __ASSEMBLY__ */
1717

1818
#include <asm/cpu/timer-regs.h>
19-
#include <asm/unit/clock.h>
19+
#include <unit/clock.h>
2020

2121
/*
2222
* jiffies counter specifications

‎arch/mn10300/unit-asb2305/leds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <asm/processor.h>
1616
#include <asm/cpu/intctl-regs.h>
1717
#include <asm/cpu/rtc-regs.h>
18-
#include <asm/unit/leds.h>
18+
#include <unit/leds.h>
1919

2020
static const u8 asb2305_led_hex_tbl[16] = {
2121
0x80, 0xf2, 0x48, 0x60, 0x32, 0x24, 0x04, 0xf0,

‎arch/mn10300/unit-asb2305/unit-init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <asm/cpu/intctl-regs.h>
1919
#include <asm/cpu/rtc-regs.h>
2020
#include <asm/cpu/serial-regs.h>
21-
#include <asm/unit/serial.h>
21+
#include <unit/serial.h>
2222

2323
/*
2424
* initialise some of the unit hardware before gdbstub is set up

‎drivers/net/smc91x.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,
369369
* MN10300/AM33 configuration
370370
*/
371371

372-
#include <asm/unit/smc91111.h>
372+
#include <unit/smc91111.h>
373373

374374
#else
375375

0 commit comments

Comments
 (0)