diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-04-25 09:14:30 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-17 21:41:11 +0200 |
| commit | d30a6ea401faf684ea4298afe2990f7f67d6e502 (patch) | |
| tree | ce6cb089531e22120a535ad995df5f909de722c2 /backport/compat/dma-shared-helpers.c | |
| parent | 9630d32a00961fd429bafd90c97d3cdfd1865564 (diff) | |
backports: ifdef code already present in RHEL7.0
Upstream commit: 6dfa96a892c962cda981cda1b2c88e6b1df5c886
Avoid conflicts with RHEL7.0 as DEVICE_ATTR_* defines,
enum pkt_hash_types, skb_set_hash(), dma_common_get_sgtable()
are already present.
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport/compat/dma-shared-helpers.c')
| -rw-r--r-- | backport/compat/dma-shared-helpers.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backport/compat/dma-shared-helpers.c b/backport/compat/dma-shared-helpers.c index f76cf06b..2ada681d 100644 --- a/backport/compat/dma-shared-helpers.c +++ b/backport/compat/dma-shared-helpers.c @@ -20,6 +20,7 @@ #endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(3,6,0) */ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */ +#if RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) /* * Create scatter-list for the already allocated DMA buffer. */ @@ -37,3 +38,4 @@ int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, return 0; } EXPORT_SYMBOL_GPL(dma_common_get_sgtable); +#endif /* RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(7,0) */ |