MN10300: Separate out the proc and unit header dirs from the general headers
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 MN10300: Separate out the proc and unit header dirs from the general headers
Separate out the proc- and unit-specific header directories from the general MN10300 arch headers and dangle them instead from the same directories as contain the .c files for the processor and unit implementations.
---
arch/mn10300/Makefile | 40 ------ arch/mn10300/include/asm/cache.h | 2 arch/mn10300/include/asm/irq.h | 2 arch/mn10300/include/asm/proc-mn103e010/cache.h | 33 ----- arch/mn10300/include/asm/proc-mn103e010/clock.h | 18 --- arch/mn10300/include/asm/proc-mn103e010/irq.h | 34 ----- arch/mn10300/include/asm/proc-mn103e010/proc.h | 18 --- arch/mn10300/include/asm/serial.h | 2 arch/mn10300/include/asm/timex.h | 2 arch/mn10300/include/asm/unit-asb2303/clock.h | 45 ------- arch/mn10300/include/asm/unit-asb2303/leds.h | 43 ------- arch/mn10300/include/asm/unit-asb2303/serial.h | 136 --------------------- arch/mn10300/include/asm/unit-asb2303/smc91111.h | 50 -------- arch/mn10300/include/asm/unit-asb2303/timex.h | 135 --------------------- arch/mn10300/include/asm/unit-asb2305/clock.h | 45 ------- arch/mn10300/include/asm/unit-asb2305/leds.h | 51 -------- arch/mn10300/include/asm/unit-asb2305/serial.h | 120 ------------------- arch/mn10300/include/asm/unit-asb2305/timex.h | 135 --------------------- arch/mn10300/kernel/entry.S | 2 arch/mn10300/kernel/gdb-io-serial-low.S | 2 arch/mn10300/kernel/gdb-io-serial.c | 2 arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 arch/mn10300/kernel/gdb-io-ttysm.c | 2 arch/mn10300/kernel/gdb-stub.c | 4 - arch/mn10300/kernel/head.S | 2 arch/mn10300/kernel/mn10300-serial-low.S | 4 - arch/mn10300/kernel/mn10300-serial.c | 2 arch/mn10300/kernel/mn10300-watchdog.c | 2 arch/mn10300/kernel/setup.c | 2 arch/mn10300/kernel/traps.c | 2 arch/mn10300/proc-mn103e010/include/proc/cache.h | 33 +++++ arch/mn10300/proc-mn103e010/include/proc/clock.h | 18 +++ arch/mn10300/proc-mn103e010/include/proc/irq.h | 34 +++++ arch/mn10300/proc-mn103e010/include/proc/proc.h | 18 +++ arch/mn10300/unit-asb2303/include/unit/clock.h | 45 +++++++ arch/mn10300/unit-asb2303/include/unit/leds.h | 43 +++++++ arch/mn10300/unit-asb2303/include/unit/serial.h | 136 +++++++++++++++++++++ arch/mn10300/unit-asb2303/include/unit/smc91111.h | 50 ++++++++ arch/mn10300/unit-asb2303/include/unit/timex.h | 135 +++++++++++++++++++++ arch/mn10300/unit-asb2303/leds.c | 2 arch/mn10300/unit-asb2303/smc91111.c | 2 arch/mn10300/unit-asb2305/include/unit/clock.h | 45 +++++++ arch/mn10300/unit-asb2305/include/unit/leds.h | 51 ++++++++ arch/mn10300/unit-asb2305/include/unit/serial.h | 120 +++++++++++++++++++ arch/mn10300/unit-asb2305/include/unit/timex.h | 135 +++++++++++++++++++++ arch/mn10300/unit-asb2305/leds.c | 2 arch/mn10300/unit-asb2305/unit-init.c | 2 47 files changed, 888 insertions(+), 922 deletions(-) delete mode 100644 arch/mn10300/include/asm/proc-mn103e010/cache.h delete mode 100644 arch/mn10300/include/asm/proc-mn103e010/clock.h delete mode 100644 arch/mn10300/include/asm/proc-mn103e010/irq.h delete mode 100644 arch/mn10300/include/asm/proc-mn103e010/proc.h delete mode 100644 arch/mn10300/include/asm/unit-asb2303/clock.h delete mode 100644 arch/mn10300/include/asm/unit-asb2303/leds.h delete mode 100644 arch/mn10300/include/asm/unit-asb2303/serial.h delete mode 100644 arch/mn10300/include/asm/unit-asb2303/smc91111.h delete mode 100644 arch/mn10300/include/asm/unit-asb2303/timex.h delete mode 100644 arch/mn10300/include/asm/unit-asb2305/clock.h delete mode 100644 arch/mn10300/include/asm/unit-asb2305/leds.h delete mode 100644 arch/mn10300/include/asm/unit-asb2305/serial.h delete mode 100644 arch/mn10300/include/asm/unit-asb2305/timex.h create mode 100644 arch/mn10300/proc-mn103e010/include/proc/cache.h create mode 100644 arch/mn10300/proc-mn103e010/include/proc/clock.h create mode 100644 arch/mn10300/proc-mn103e010/include/proc/irq.h create mode 100644 arch/mn10300/proc-mn103e010/include/proc/proc.h create mode 100644 arch/mn10300/unit-asb2303/include/unit/clock.h create mode 100644 arch/mn10300/unit-asb2303/include/unit/leds.h create mode 100644 arch/mn10300/unit-asb2303/include/unit/serial.h create mode 100644 arch/mn10300/unit-asb2303/include/unit/smc91111.h create mode 100644 arch/mn10300/unit-asb2303/include/unit/timex.h create mode 100644 arch/mn10300/unit-asb2305/include/unit/clock.h create mode 100644 arch/mn10300/unit-asb2305/include/unit/leds.h create mode 100644 arch/mn10300/unit-asb2305/include/unit/serial.h create mode 100644 arch/mn10300/unit-asb2305/include/unit/timex.h
arch/mn10300/Makefile +3 -37
@@ -94,42 +94,8 @@ ifdef CONFIG_DEBUG_INFO KBUILD_AFLAGS += -Wa,--gdwarf2 endif -################################################################################################### # -# juggle some symlinks in the MN10300 asm include dir +# include the appropriate processor- and unit-specific headers # -# Update machine proc and unit symlinks if something which affects -# them changed. We use .proc / .unit to indicate when they were -# updated last, otherwise make uses the target directory mtime. -# -################################################################################################### - -# processor specific definitions -arch/mn10300/include/asm/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf - @echo ' SYMLINK arch/mn10300/include/asm/proc -> arch/mn10300/include/asm/proc-$(PROCESSOR)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p arch/mn10300/include/asm - $(Q)ln -fsn $(srctree)/arch/mn10300/include/asm/proc-$(PROCESSOR) arch/mn10300/include/asm/proc -else - $(Q)ln -fsn proc-$(PROCESSOR) arch/mn10300/include/asm/proc -endif - @touch $@ - -CLEAN_FILES += arch/mn10300/include/asm/proc arch/mn10300/include/asm/.proc - -prepare: arch/mn10300/include/asm/.proc - -# unit specific definitions -arch/mn10300/include/asm/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf - @echo ' SYMLINK arch/mn10300/include/asm/unit -> arch/mn10300/include/asm/unit-$(UNIT)' -ifneq ($(KBUILD_SRC),) - $(Q)mkdir -p arch/mn10300/include/asm - $(Q)ln -fsn $(srctree)/arch/mn10300/include/asm/unit-$(UNIT) arch/mn10300/include/asm/unit -else - $(Q)ln -fsn unit-$(UNIT) arch/mn10300/include/asm/unit -endif - @touch $@ - -CLEAN_FILES += arch/mn10300/include/asm/unit arch/mn10300/include/asm/.unit - -prepare: arch/mn10300/include/asm/.unit +KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include +KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include
arch/mn10300/include/asm/cache.h +1 -1
@@ -13,7 +13,7 @@#define _ASM_CACHE_H#include <asm/cpu-regs.h> -#include <asm/proc/cache.h> +#include <proc/cache.h> #ifndef __ASSEMBLY__#define L1_CACHE_DISPARITY (L1_CACHE_NENTRIES * L1_CACHE_BYTES)
arch/mn10300/include/asm/irq.h +1 -1
@@ -16,7 +16,7 @@#include <asm/intctl-regs.h> #include <asm/reset-regs.h> -#include <asm/proc/irq.h> +#include <proc/irq.h> /* this number is used when no interrupt has been assigned */ #define NO_IRQ INT_MAX
arch/mn10300/include/asm/proc-mn103e010/cache.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* MN103E010 Cache specification -* -* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. -* Written by David Howells ([email protected]) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public Licence -* as published by the Free Software Foundation; either version -* 2 of the Licence, or (at your option) any later version. -*/ -#ifndef _ASM_PROC_CACHE_H -#define _ASM_PROC_CACHE_H - -/* L1 cache */ - -#define L1_CACHE_NWAYS 4/* number of ways in caches */ -#define L1_CACHE_NENTRIES 256/* number of entries in each way */ -#define L1_CACHE_BYTES 16/* bytes per entry */ -#define L1_CACHE_SHIFT 4/* shift for bytes per entry */ -#define L1_CACHE_WAYDISP 0x1000/* displacement of one way from the next */ - -#define L1_CACHE_TAG_VALID 0x00000001/* cache tag valid bit */ -#define L1_CACHE_TAG_DIRTY 0x00000008/* data cache tag dirty bit */ -#define L1_CACHE_TAG_ENTRY 0x00000ff0/* cache tag entry address mask */ -#define L1_CACHE_TAG_ADDRESS 0xfffff000/* cache tag line address mask */ - -/* -* specification of the interval between interrupt checking intervals whilst -* managing the cache with the interrupts disabled -*/ -#define MN10300_DCACHE_INV_RANGE_INTR_LOG2_INTERVAL 4 - -#endif /* _ASM_PROC_CACHE_H */
arch/mn10300/include/asm/proc-mn103e010/clock.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* MN103E010-specific clocks -* -* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. -* Written by David Howells ([email protected]) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public Licence -* as published by the Free Software Foundation; either version -* 2 of the Licence, or (at your option) any later version. -*/ -#ifndef _ASM_PROC_CLOCK_H -#define _ASM_PROC_CLOCK_H - -#include <asm/unit/clock.h> - -#define MN10300_WDCLK MN10300_IOCLK - -#endif /* _ASM_PROC_CLOCK_H */
arch/mn10300/include/asm/proc-mn103e010/irq.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* MN103E010 On-board interrupt controller numbers -* -* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. -* Written by David Howells ([email protected]) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public Licence -* as published by the Free Software Foundation; either version -* 2 of the Licence, or (at your option) any later version. -*/ - -#ifndef _ASM_PROC_IRQ_H -#define _ASM_PROC_IRQ_H - -#ifdef __KERNEL__ - -#define GxICR_NUM_IRQS 42 - -#define GxICR_NUM_XIRQS 8 - -#define XIRQ0 34 -#define XIRQ1 35 -#define XIRQ2 36 -#define XIRQ3 37 -#define XIRQ4 38 -#define XIRQ5 39 -#define XIRQ6 40 -#define XIRQ7 41 - -#define XIRQ2IRQ (num) (XIRQ0 + num) - -#endif /* __KERNEL__ */ - -#endif /* _ASM_PROC_IRQ_H */
arch/mn10300/include/asm/proc-mn103e010/proc.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* MN103E010 Processor description -* -* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. -* Written by David Howells ([email protected]) -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public Licence -* as published by the Free Software Foundation; either version -* 2 of the Licence, or (at your option) any later version. -*/ - -#ifndef _ASM_PROC_PROC_H -#define _ASM_PROC_PROC_H - -#define PROCESSOR_VENDOR_NAME "Matsushita" -#define PROCESSOR_MODEL_NAME "mn103e010" - -#endif /* _ASM_PROC_PROC_H */
arch/mn10300/include/asm/serial.h +1 -1
@@ -33,4 +33,4 @@#define RS_TABLE_SIZE #endif -#include <asm/unit/serial.h> +#include <unit/serial.h>
arch/mn10300/include/asm/timex.h +1 -1
@@ -12,7 +12,7 @@#define _ASM_TIMEX_H#include <asm/hardirq.h> -#include <asm/unit/timex.h> +#include <unit/timex.h> #define TICK_SIZE (tick_nsec / 1000)
arch/mn10300/include/asm/unit-asb2303/clock.h deleted +0 -45
45 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2303/leds.h deleted +0 -43
43 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2303/serial.h deleted +0 -136
136 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2303/smc91111.h deleted +0 -50
50 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2303/timex.h deleted +0 -135
135 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2305/clock.h deleted +0 -45
45 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2305/leds.h deleted +0 -51
51 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2305/serial.h deleted +0 -120
120 lines not on this page · raw message
arch/mn10300/include/asm/unit-asb2305/timex.h deleted +0 -135
135 lines not on this page · raw message
arch/mn10300/kernel/entry.S +1 -1
@@ -20,7 +20,7 @@ #include <asm/intctl-regs.h> #include <asm/busctl-regs.h> #include <asm/timer-regs.h> -#include <asm/unit/leds.h> +#include <unit/leds.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/errno.h>
arch/mn10300/kernel/gdb-io-serial-low.S +1 -1
@@ -18,7 +18,7 @@ #include <asm/thread_info.h> #include <asm/frame.inc> #include <asm/intctl-regs.h> -#include <asm/unit/serial.h> +#include <unit/serial.h> .text
arch/mn10300/kernel/gdb-io-serial.c +1 -1
@@ -22,7 +22,7 @@#include <asm/gdb-stub.h> #include <asm/exceptions.h> #include <asm/serial-regs.h> -#include <asm/unit/serial.h> +#include <unit/serial.h> /* * initialise the GDB stub
arch/mn10300/kernel/gdb-io-ttysm-low.S +1 -1
@@ -18,7 +18,7 @@ #include <asm/cpu-regs.h> #include <asm/frame.inc> #include <asm/intctl-regs.h> -#include <asm/unit/serial.h> +#include <unit/serial.h> #include "mn10300-serial.h" .text
arch/mn10300/kernel/gdb-io-ttysm.c +1 -1
@@ -20,7 +20,7 @@#include <asm/system.h> #include <asm/gdb-stub.h> #include <asm/exceptions.h> -#include <asm/unit/clock.h> +#include <unit/clock.h> #include "mn10300-serial.h" #if defined(CONFIG_GDBSTUB_ON_TTYSM0 )
arch/mn10300/kernel/gdb-stub.c +2 -2
@@ -136,8 +136,8 @@#include <asm/cacheflush.h> #include <asm/serial-regs.h> #include <asm/busctl-regs.h> -#include <asm/unit/leds.h> -#include <asm/unit/serial.h> +#include <unit/leds.h> +#include <unit/serial.h> /* define to use F7F7 rather than FF which is subverted by JTAG debugger */ #undef GDBSTUB_USE_F7F7_AS_BREAKPOINT
arch/mn10300/kernel/head.S +1 -1
@@ -17,7 +17,7 @@ #include <asm/pgtable.h> #include <asm/frame.inc> #include <asm/param.h> -#include <asm/unit/serial.h> +#include <unit/serial.h> .section .text.head,"ax"
arch/mn10300/kernel/mn10300-serial-low.S +2 -2
@@ -18,8 +18,8 @@ #include <asm/cpu-regs.h> #include <asm/frame.inc> #include <asm/timer-regs.h> -#include <asm/proc/cache.h> -#include <asm/unit/timex.h> +#include <proc/cache.h> +#include <unit/timex.h> #include "mn10300-serial.h" #define SCxCTR 0x00
arch/mn10300/kernel/mn10300-serial.c +1 -1
@@ -41,7 +41,7 @@ static const char serial_revdate[] = "2007-11-06";#include <asm/irq.h> #include <asm/bitops.h> #include <asm/serial-regs.h> -#include <asm/unit/timex.h> +#include <unit/timex.h> #include "mn10300-serial.h" static inline __attribute__((format(printf, 1, 2)))
arch/mn10300/kernel/mn10300-watchdog.c +1 -1
@@ -25,7 +25,7 @@#include <asm/div64.h> #include <asm/smp.h> #include <asm/gdb-stub.h> -#include <asm/proc/clock.h> +#include <proc/clock.h> static DEFINE_SPINLOCK (watchdog_print_lock);static unsigned int watchdog;
arch/mn10300/kernel/setup.c +1 -1
@@ -30,7 +30,7 @@#include <asm/setup.h> #include <asm/io.h> #include <asm/smp.h> -#include <asm/proc/proc.h> +#include <proc/proc.h> #include <asm/busctl-regs.h> #include <asm/fpu.h> #include <asm/sections.h>
arch/mn10300/kernel/traps.c +1 -1
@@ -37,7 +37,7 @@#include <asm/cacheflush.h> #include <asm/cpu-regs.h> #include <asm/busctl-regs.h> -#include <asm/unit/leds.h> +#include <unit/leds.h> #include <asm/fpu.h> #include <asm/gdb-stub.h> #include <asm/sections.h>
arch/mn10300/proc-mn103e010/include/proc/cache.h new file +33 -0
@@ -0,0 +1,33 @@ +/* MN103E010 Cache specification +* +* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence +* as published by the Free Software Foundation; either version +* 2 of the Licence, or (at your option) any later version. +*/ +#ifndef _ASM_PROC_CACHE_H +#define _ASM_PROC_CACHE_H + +/* L1 cache */ + +#define L1_CACHE_NWAYS 4/* number of ways in caches */ +#define L1_CACHE_NENTRIES 256/* number of entries in each way */ +#define L1_CACHE_BYTES 16/* bytes per entry */ +#define L1_CACHE_SHIFT 4/* shift for bytes per entry */ +#define L1_CACHE_WAYDISP 0x1000/* displacement of one way from the next */ + +#define L1_CACHE_TAG_VALID 0x00000001/* cache tag valid bit */ +#define L1_CACHE_TAG_DIRTY 0x00000008/* data cache tag dirty bit */ +#define L1_CACHE_TAG_ENTRY 0x00000ff0/* cache tag entry address mask */ +#define L1_CACHE_TAG_ADDRESS 0xfffff000/* cache tag line address mask */ + +/* +* specification of the interval between interrupt checking intervals whilst +* managing the cache with the interrupts disabled +*/ +#define MN10300_DCACHE_INV_RANGE_INTR_LOG2_INTERVAL 4 + +#endif /* _ASM_PROC_CACHE_H */
arch/mn10300/proc-mn103e010/include/proc/clock.h new file +18 -0
@@ -0,0 +1,18 @@ +/* MN103E010-specific clocks +* +* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence +* as published by the Free Software Foundation; either version +* 2 of the Licence, or (at your option) any later version. +*/ +#ifndef _ASM_PROC_CLOCK_H +#define _ASM_PROC_CLOCK_H + +#include <unit/clock.h> + +#define MN10300_WDCLK MN10300_IOCLK + +#endif /* _ASM_PROC_CLOCK_H */
arch/mn10300/proc-mn103e010/include/proc/irq.h new file +34 -0
@@ -0,0 +1,34 @@ +/* MN103E010 On-board interrupt controller numbers +* +* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence +* as published by the Free Software Foundation; either version +* 2 of the Licence, or (at your option) any later version. +*/ + +#ifndef _ASM_PROC_IRQ_H +#define _ASM_PROC_IRQ_H + +#ifdef __KERNEL__ + +#define GxICR_NUM_IRQS 42 + +#define GxICR_NUM_XIRQS 8 + +#define XIRQ0 34 +#define XIRQ1 35 +#define XIRQ2 36 +#define XIRQ3 37 +#define XIRQ4 38 +#define XIRQ5 39 +#define XIRQ6 40 +#define XIRQ7 41 + +#define XIRQ2IRQ (num) (XIRQ0 + num) + +#endif /* __KERNEL__ */ + +#endif /* _ASM_PROC_IRQ_H */
arch/mn10300/proc-mn103e010/include/proc/proc.h new file +18 -0
@@ -0,0 +1,18 @@ +/* MN103E010 Processor description +* +* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. +* Written by David Howells ([email protected]) +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public Licence +* as published by the Free Software Foundation; either version +* 2 of the Licence, or (at your option) any later version. +*/ + +#ifndef _ASM_PROC_PROC_H +#define _ASM_PROC_PROC_H + +#define PROCESSOR_VENDOR_NAME "Matsushita" +#define PROCESSOR_MODEL_NAME "mn103e010" + +#endif /* _ASM_PROC_PROC_H */
arch/mn10300/unit-asb2303/include/unit/clock.h new file +45 -0
45 lines not on this page · raw message
arch/mn10300/unit-asb2303/include/unit/leds.h new file +43 -0
43 lines not on this page · raw message
arch/mn10300/unit-asb2303/include/unit/serial.h new file +136 -0
136 lines not on this page · raw message
arch/mn10300/unit-asb2303/include/unit/smc91111.h new file +50 -0
50 lines not on this page · raw message
arch/mn10300/unit-asb2303/include/unit/timex.h new file +135 -0
135 lines not on this page · raw message
arch/mn10300/unit-asb2303/leds.c +1 -1
@@ -16,7 +16,7 @@#include <asm/processor.h> #include <asm/intctl-regs.h> #include <asm/rtc-regs.h> -#include <asm/unit/leds.h> +#include <unit/leds.h> #if 0 static const u8 asb2303_led_hex_tbl[16] = {
arch/mn10300/unit-asb2303/smc91111.c +1 -1
@@ -18,7 +18,7 @@#include <asm/timex.h> #include <asm/processor.h> #include <asm/intctl-regs.h> -#include <asm/unit/smc91111.h> +#include <unit/smc91111.h> static struct resource smc91c111_resources[] = { [0 ] = {
arch/mn10300/unit-asb2305/include/unit/clock.h new file +45 -0
45 lines not on this page · raw message
arch/mn10300/unit-asb2305/include/unit/leds.h new file +51 -0
51 lines not on this page · raw message
arch/mn10300/unit-asb2305/include/unit/serial.h new file +120 -0
120 lines not on this page · raw message
arch/mn10300/unit-asb2305/include/unit/timex.h new file +135 -0
135 lines not on this page · raw message
arch/mn10300/unit-asb2305/leds.c +1 -1
@@ -15,7 +15,7 @@#include <asm/processor.h> #include <asm/cpu/intctl-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 ] = {0x80 ,0xf2 ,0x48 ,0x60 ,0x32 ,0x24 ,0x04 ,0xf0 ,
arch/mn10300/unit-asb2305/unit-init.c +1 -1
@@ -18,7 +18,7 @@#include <asm/cpu/intctl-regs.h> #include <asm/cpu/rtc-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
drivers/net/smc91x.h +1 -1
@@ -369,7 +369,7 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r,* MN10300/AM33 configuration */ -#include <asm/unit/smc91111.h> +#include <unit/smc91111.h> #else
Re: [PATCH 1/2] MN10300: Move to arch/mn10300/include/asm/
In reply to a message not in the archiveQuoted 2 lines · David Howells
Move arch headers from
include/asm-mn10300/toarch/mn10300/include/asm/.
This patch looks broken.
It doesn't "move" anything at all. It just copies things, and leaves the old files alone.
I wonder if you created the diff by doing
git diff arch/mn10300
because you had other changes pending that you didn't want to include?
Regardless, I'm not applying something this obviously broken.
Linus
Re: [PATCH 1/2] MN10300: Move to arch/mn10300/include/asm/
Quoted 11 lines · Linus Torvalds
Quoted 2 lines · David Howells
Move arch headers from
include/asm-mn10300/toarch/mn10300/include/asm/.This patch looks broken.
It doesn't "move" anything at all. It just copies things, and leaves the old files alone.
Quoted 7 lines
I wonder if you created the diff by doing
git diff arch/mn10300because you had other changes pending that you didn't want to include?
Regardless, I'm not applying something this obviously broken.
BTW, *please* use -M when posting that kind of patches. You'll end up with several lines per moved file and "yes, this is just a move" immediately obvious from the patch.