Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 3 deletions

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index f2ae8a006ff8..4fc6454f7ebb 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -346,7 +346,6 @@ enum {
 #define QI_PC_PASID_SEL         (QI_PC_TYPE | QI_PC_GRAN(1))
 
 #define QI_EIOTLB_ADDR(addr)    ((u64)(addr) & VTD_PAGE_MASK)
-#define QI_EIOTLB_GL(gl)        (((u64)gl) << 7)
 #define QI_EIOTLB_IH(ih)        (((u64)ih) << 6)
 #define QI_EIOTLB_AM(am)        (((u64)am))
 #define QI_EIOTLB_PASID(pasid)  (((u64)pasid) << 32)
@@ -378,8 +377,6 @@ enum {
 #define QI_RESP_INVALID         0x1
 #define QI_RESP_FAILURE         0xf
 
-#define QI_GRAN_ALL_ALL                 0
-#define QI_GRAN_NONG_ALL                1
 #define QI_GRAN_NONG_PASID              2
 #define QI_GRAN_PSI_PASID               3