diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-21 21:52:46 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-21 23:52:41 +0100 |
commit | 43eec7ae5ba8a25d001b2af9931931afb41f6288 (patch) | |
tree | 058e609d4ef69eaee4c5312b6b4e54584a2ee51e | |
parent | 9ae6b6c18e1cfd1bc4df62def052fb3a2888c4fd (diff) |
backports: remove swiotlb_nr_tbl()v3.12.1-1
Upstream commit 582829f7d8c136730ee9f5e1d90d4d157b93602b
This is not used anywhere.
The Debian Wheezy kernel also includes this function and it conflicted
with backports version.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r-- | backport/backport-include/linux/swiotlb.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/backport/backport-include/linux/swiotlb.h b/backport/backport-include/linux/swiotlb.h deleted file mode 100644 index d010d0dc..00000000 --- a/backport/backport-include/linux/swiotlb.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __BACKPORT_LINUX_SWIOTLB_H -#define __BACKPORT_LINUX_SWIOTLB_H - -#include <linux/version.h> - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) -#include_next <linux/swiotlb.h> -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) */ - -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) -#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) -static inline unsigned long swiotlb_nr_tbl(void) -{ - return 0; -} -#endif -#endif - -#endif /* __BACKPORT_LINUX_SWIOTLB_H */ |