diff options
| author | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-08-30 19:00:52 (GMT) |
|---|---|---|
| committer | J. German Rivera <German.Rivera@freescale.com> | 2013-08-30 19:00:52 (GMT) |
| commit | 0b162009876afc5df7313bb99bdc9a8841a5f69e (patch) | |
| tree | d756589dca76240f78e2584eafdd17f6a89c56c5 /include | |
| parent | 63479e74d5bf8cad9e7f7bde52d5eb4d43925df9 (diff) | |
| parent | 2baf518cf0005757c3851f9c2ce18904d2a0218e (diff) | |
| download | linux-fsl-qoriq-0b162009876afc5df7313bb99bdc9a8841a5f69e.tar.xz | |
Merge branch 'b4860rev2' into sdk-kernel-3.8
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_dpa_offload.h | 2 | ||||
| -rw-r--r-- | include/linux/iommu.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/fsl_dpa_offload.h b/include/linux/fsl_dpa_offload.h index c85c4c6..b5f4e6e 100644 --- a/include/linux/fsl_dpa_offload.h +++ b/include/linux/fsl_dpa_offload.h @@ -162,7 +162,7 @@ struct ipv4_header { uint8_t *options; /* Size of IPv4 options buffer. Zero for no options. */ - unsigned int options_size; + uint8_t options_size; }; /* Description of the VLAN header */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 5153c0c..992d45a 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -45,6 +45,7 @@ enum stash_target { IOMMU_ATTR_CACHE_L1 = 1, IOMMU_ATTR_CACHE_L2, IOMMU_ATTR_CACHE_L3, + IOMMU_ATTR_CACHE_DSP_L2, }; /* This attribute corresponds to IOMMUs capable of generating @@ -89,9 +90,7 @@ enum omap_index { OMI_QMAN_PRIV, OMI_CAAM, OMI_PMAN, - OMI_DMA, - OMI_DMA_READI, - OMI_MAPLE, + OMI_DSP, OMI_MAX, }; |