diff --git a/[refs] b/[refs]
index baff1921e4cd..f4dbebfccb5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4987ce82056327a43cd58c32adf8a3f255e7d862
+refs/heads/master: 909094c62e21c71c4fd122642512ad05b75fe019
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index aaaf954ad3a4..fb07e05a947b 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -600,8 +600,8 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries)
 	u32 table_offset;
 	u8 bir;
 
-	pci_read_config_dword(dev,
-		msix_table_offset_reg(dev->msix_cap), &table_offset);
+	pci_read_config_dword(dev, dev->msix_cap + PCI_MSIX_TABLE,
+			      &table_offset);
 	bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
 	table_offset &= ~PCI_MSIX_FLAGS_BIRMASK;
 	phys_addr = pci_resource_start(dev, bir) + table_offset;
diff --git a/trunk/drivers/pci/msi.h b/trunk/drivers/pci/msi.h
index bc5cd9969062..d76c7b2c993c 100644
--- a/trunk/drivers/pci/msi.h
+++ b/trunk/drivers/pci/msi.h
@@ -9,8 +9,6 @@
 #define msi_mask_reg(base, is64bit)	\
 	(base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32))
 
-#define msix_table_offset_reg(base)	(base + PCI_MSIX_TABLE)
-#define msix_pba_offset_reg(base)	(base + PCI_MSIX_PBA)
 #define msix_table_size(control) 	((control & PCI_MSIX_FLAGS_QSIZE)+1)
 #define multi_msix_capable(control)	msix_table_size((control))