diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-04 02:59:06 +0400 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-10-04 02:59:06 +0400 |
| commit | 75d43b2d0a323ba894d85060888f039e41b441ca (patch) | |
| tree | 2f49ace1f85510e8b21974e6dd45dfcc2a87666a /include | |
| parent | d0b7abb2c7c05552aca2a0358c53b6a48eab2843 (diff) | |
| parent | cb0446c1b625326682ec4f9d1dd10779433646bc (diff) | |
| download | linux-75d43b2d0a323ba894d85060888f039e41b441ca.tar.xz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
Freescale updates from Scott (27 commits):
"Highlights include DMA32 zone support (SATA, USB, etc now works on 64-bit
FSL kernels), MSI changes, 8xx optimizations and cleanup, t104x board
support, and PrPMC PCI enumeration."
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_ifc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/fsl_ifc.h b/include/linux/fsl_ifc.h index f49ddb1b2273..84d60cb841b1 100644 --- a/include/linux/fsl_ifc.h +++ b/include/linux/fsl_ifc.h @@ -781,13 +781,13 @@ struct fsl_ifc_regs { __be32 amask; u32 res4[0x2]; } amask_cs[FSL_IFC_BANK_COUNT]; - u32 res5[0x17]; + u32 res5[0x18]; struct { - __be32 csor_ext; __be32 csor; + __be32 csor_ext; u32 res6; } csor_cs[FSL_IFC_BANK_COUNT]; - u32 res7[0x19]; + u32 res7[0x18]; struct { __be32 ftim[4]; u32 res8[0x8]; |