backports: fix conflict in swiotlb_nr_tbl() on RHEL 6.4
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 18 Aug 2013 23:38:04 +0000 (01:38 +0200)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Tue, 27 Aug 2013 18:43:04 +0000 (11:43 -0700)
commit5bb729709380c458fd530901b2978be4f635d35d
treedb3ecd9d8cdab67d0470ab359557abdfdfad9717
parentd1e6a65bed09e5f5da9ba4069210570694edd5df
backports: fix conflict in swiotlb_nr_tbl() on RHEL 6.4

The RedHat kernel also provides a implementation for swiotlb_nr_tbl(),
us that one on these kernels.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
backport/backport-include/linux/swiotlb.h