projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-nios
[oweals/u-boot.git]
/
arch
/
powerpc
/
include
/
asm
/
immap_85xx.h
diff --git
a/arch/powerpc/include/asm/immap_85xx.h
b/arch/powerpc/include/asm/immap_85xx.h
index 0c9d85ec9669fd2fcf6c1aa9377c78fe242f7580..101b8db0ee455d97593c9fc8b51edeb3bfa9a0f3 100644
(file)
--- a/
arch/powerpc/include/asm/immap_85xx.h
+++ b/
arch/powerpc/include/asm/immap_85xx.h
@@
-19,7
+19,7
@@
#include <fsl_sec.h>
#include <fsl_sfp.h>
#include <asm/fsl_lbc.h>
-#include <
asm/
fsl_fman.h>
+#include <fsl_fman.h>
#include <fsl_immap.h>
typedef struct ccsr_local {