diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-29 09:23:11 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-29 09:23:11 +0100 |
| commit | feaa43f3a8f465cbf01ffa1b23b6b52431819a52 (patch) | |
| tree | 3ee393d421c72a882d27b1de5978a2a9befce062 /include/asm-ppc/immap_fsl_pci.h | |
| parent | 8697e6a19b10f514511b6a9c86de88bd108c4f8d (diff) | |
| parent | e174ac34adf5d5653df12bc3cf19c52063a71269 (diff) | |
| download | talos-obmc-uboot-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.tar.gz talos-obmc-uboot-feaa43f3a8f465cbf01ffa1b23b6b52431819a52.zip | |
Merge branch 'for-1.3.2-ver2'
Conflicts:
cpu/ppc4xx/fdt.c
include/configs/kilauea.h
include/configs/sequoia.h
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'include/asm-ppc/immap_fsl_pci.h')
| -rw-r--r-- | include/asm-ppc/immap_fsl_pci.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc/immap_fsl_pci.h b/include/asm-ppc/immap_fsl_pci.h index bd732b6688..6715064c94 100644 --- a/include/asm-ppc/immap_fsl_pci.h +++ b/include/asm-ppc/immap_fsl_pci.h @@ -144,7 +144,9 @@ typedef struct ccsr_pci { u32 perr_cap1; /* 0xe2c - PCIE Error Capture Register 1 */ u32 perr_cap2; /* 0xe30 - PCIE Error Capture Register 2 */ u32 perr_cap3; /* 0xe34 - PCIE Error Capture Register 3 */ - char res23[456]; /* (- #x1000 #xe38) 456 */ + char res23[200]; + u32 pdb_stat; /* 0xf00 - PCIE Debug Status */ + char res24[252]; } ccsr_fsl_pci_t; #endif /*__IMMAP_fsl_pci__*/ |
