]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'next' of /home/wd/git/u-boot/next
authorWolfgang Denk <wd@denx.de>
Tue, 28 Sep 2010 21:30:47 +0000 (23:30 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 28 Sep 2010 21:30:47 +0000 (23:30 +0200)
Conflicts:
include/ppc4xx.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
29 files changed:
1  2 
Makefile
README
arch/powerpc/cpu/mpc512x/Makefile
arch/powerpc/cpu/ppc4xx/fdt.c
board/amcc/ebony/flash.c
drivers/video/cfb_console.c
include/common.h
include/configs/CATcenter.h
include/configs/KAREF.h
include/configs/METROBOX.h
include/configs/MIP405.h
include/configs/PMC440.h
include/configs/XPEDITE1000.h
include/configs/acadia.h
include/configs/alpr.h
include/configs/hcu5.h
include/configs/icon.h
include/configs/katmai.h
include/configs/kilauea.h
include/configs/korat.h
include/configs/lwmon5.h
include/configs/makalu.h
include/configs/mcu25.h
include/configs/ocotea.h
include/configs/redwood.h
include/configs/sequoia.h
include/configs/taishan.h
include/configs/yucca.h
include/configs/zeus.h

diff --cc Makefile
Simple merge
diff --cc README
Simple merge
Simple merge
Simple merge
index 79d2c4c307181d97f557df8fd5383ec53ecb02e6,94eeee2e49d8133a93e7b4f23c47043dff8d94e1..df7716cd78020bab94dd5aca1e5734f5508bd059
@@@ -32,9 -32,8 +32,9 @@@
   */
  
  #include <common.h>
- #include <ppc4xx.h>
+ #include <asm/ppc4xx.h>
  #include <asm/processor.h>
 +#include <asm/io.h>
  
  #undef DEBUG
  #ifdef DEBUG
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge