Merge tag 'v3.13-rc4' into core/locking

Merge Linux 3.13-rc4, to refresh this rather old tree with the latest fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index d876e4b3c6a9..61529097464d 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -216,13 +216,13 @@ struct ctrl_reg {
 
 /* offsets to the controller registers based on the above structure layout */
 enum ctrl_offsets {
-        BASE_OFFSET      = offsetof(struct ctrl_reg, base_offset),
-        SLOT_AVAIL1      = offsetof(struct ctrl_reg, slot_avail1),
+        BASE_OFFSET      = offsetof(struct ctrl_reg, base_offset),
+        SLOT_AVAIL1      = offsetof(struct ctrl_reg, slot_avail1),
         SLOT_AVAIL2      = offsetof(struct ctrl_reg, slot_avail2),
-        SLOT_CONFIG      = offsetof(struct ctrl_reg, slot_config),
+        SLOT_CONFIG      = offsetof(struct ctrl_reg, slot_config),
         SEC_BUS_CONFIG   = offsetof(struct ctrl_reg, sec_bus_config),
         MSI_CTRL         = offsetof(struct ctrl_reg, msi_ctrl),
-        PROG_INTERFACE   = offsetof(struct ctrl_reg, prog_interface),
+        PROG_INTERFACE   = offsetof(struct ctrl_reg, prog_interface),
         CMD              = offsetof(struct ctrl_reg, cmd),
         CMD_STATUS       = offsetof(struct ctrl_reg, cmd_status),
         INTR_LOC         = offsetof(struct ctrl_reg, intr_loc),