diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-16 19:50:53 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-16 19:50:53 +0200 |
| commit | fc9970137c8f187b5938e4926224e0f3d46c3476 (patch) | |
| tree | 8d7a004483b1ec71ab7779cab468dece8382d13b /include/asm-ppc/immap_85xx.h | |
| parent | 07bc20560cb9d3d186cca268c05c82762e8c55ad (diff) | |
| parent | d35b508a55508535b6e8445b718585d27df733d3 (diff) | |
| download | u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.zip u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.tar.gz u-boot-imx-fc9970137c8f187b5938e4926224e0f3d46c3476.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/asm-ppc/immap_85xx.h')
| -rw-r--r-- | include/asm-ppc/immap_85xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 3d4816f..496fc72 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -1596,7 +1596,7 @@ typedef struct ccsr_gur { uint svr; /* 0xe00a4 - System version register */ char res10a[8]; uint rstcr; /* 0xe00b0 - Reset control register */ -#ifdef MPC8568 +#ifdef CONFIG_MPC8568 char res10b[76]; par_io_t qe_par_io[7]; /* 0xe0100 - 0xe01bf */ char res10c[3136]; |