From: Wolfgang Denk <wd@denx.de>
Date: Tue, 28 Sep 2010 21:30:47 +0000 (+0200)
Subject: Merge branch 'next' of /home/wd/git/u-boot/next
X-Git-Tag: v2010.12-rc1~174
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e6e1772c0e34871769be4aef79748fe3e47d953;p=pandora-u-boot.git

Merge branch 'next' of /home/wd/git/u-boot/next

Conflicts:
	include/ppc4xx.h

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

2e6e1772c0e34871769be4aef79748fe3e47d953
diff --cc board/amcc/ebony/flash.c
index 79d2c4c3071,94eeee2e49d..df7716cd780
--- a/board/amcc/ebony/flash.c
+++ b/board/amcc/ebony/flash.c
@@@ -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