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/.
This commit is contained in:
Linus Torvalds 2009-04-10 10:01:49 -07:00
commit d848223808
138 changed files with 31 additions and 65 deletions

View file

@ -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
include/asm-mn10300/.proc: $(wildcard include/config/proc/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-mn10300/proc -> include/asm-mn10300/proc-$(PROCESSOR)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-mn10300
$(Q)ln -fsn $(srctree)/include/asm-mn10300/proc-$(PROCESSOR) include/asm-mn10300/proc
else
$(Q)ln -fsn proc-$(PROCESSOR) include/asm-mn10300/proc
endif
@touch $@
CLEAN_FILES += include/asm-mn10300/proc include/asm-mn10300/.proc
prepare: include/asm-mn10300/.proc
# unit specific definitions
include/asm-mn10300/.unit: $(wildcard include/config/unit/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-mn10300/unit -> include/asm-mn10300/unit-$(UNIT)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-mn10300
$(Q)ln -fsn $(srctree)/include/asm-mn10300/unit-$(UNIT) include/asm-mn10300/unit
else
$(Q)ln -fsn unit-$(UNIT) include/asm-mn10300/unit
endif
@touch $@
CLEAN_FILES += include/asm-mn10300/unit include/asm-mn10300/.unit
prepare: include/asm-mn10300/.unit
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/proc-$(PROCESSOR)/include
KBUILD_CPPFLAGS += -I$(srctree)/arch/mn10300/unit-$(UNIT)/include

View file

@ -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)

View file

@ -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

View file

@ -33,4 +33,4 @@
#define RS_TABLE_SIZE
#endif
#include <asm/unit/serial.h>
#include <unit/serial.h>

View file

@ -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)

Some files were not shown because too many files have changed in this diff Show more