Merge ../linux-2.6/

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index bef21ae3cbd0..390f1851c0f1 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -41,11 +41,11 @@ static inline void move_msi(int vector) {}
 #define PCI_MSIX_FLAGS_BIRMASK          (7 << 0)
 #define PCI_MSIX_FLAGS_BITMASK          (1 << 0)
 
-#define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET        0
-#define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET        4
-#define PCI_MSIX_ENTRY_DATA_OFFSET              8
-#define PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET       12
 #define PCI_MSIX_ENTRY_SIZE                     16
+#define  PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET       0
+#define  PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET       4
+#define  PCI_MSIX_ENTRY_DATA_OFFSET             8
+#define  PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET      12
 
 #define msi_control_reg(base)           (base + PCI_MSI_FLAGS)
 #define msi_lower_address_reg(base)     (base + PCI_MSI_ADDRESS_LO)
@@ -64,7 +64,6 @@ static inline void move_msi(int vector) {}
 #define msi_enable(control, num) multi_msi_enable(control, num); \
         control |= PCI_MSI_FLAGS_ENABLE
 
-#define msix_control_reg                msi_control_reg
 #define msix_table_offset_reg(base)     (base + 0x04)
 #define msix_pba_offset_reg(base)       (base + 0x08)
 #define msix_enable(control)            control |= PCI_MSIX_FLAGS_ENABLE