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-samsung
[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 07d2adf71f1d8777107ee57bdaca84e39246a46e..c045a24d1aba15471434c22abfc6cae2fb56f66a 100644
(file)
--- a/
arch/powerpc/include/asm/immap_85xx.h
+++ b/
arch/powerpc/include/asm/immap_85xx.h
@@
-265,6
+265,7
@@
typedef struct ccsr_pcix {
#define PIWAR_WRITE_SNOOP 0x00005000
#define PIWAR_MEM_2G 0x0000001e
+#ifndef CONFIG_MPC85XX_GPIO
typedef struct ccsr_gpio {
u32 gpdir;
u32 gpodr;
@@
-273,6
+274,7
@@
typedef struct ccsr_gpio {
u32 gpimr;
u32 gpicr;
} ccsr_gpio_t;
+#endif
/* L2 Cache Registers */
typedef struct ccsr_l2cache {