Merge commit 'v3.1-rc1' into imx-fixes

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 16330bd0657c..186efd4e05c9 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -25,7 +25,7 @@ struct hw_pci {
         void            (*preinit)(void);
         void            (*postinit)(void);
         u8              (*swizzle)(struct pci_dev *dev, u8 *pin);
-        int             (*map_irq)(struct pci_dev *dev, u8 slot, u8 pin);
+        int             (*map_irq)(const struct pci_dev *dev, u8 slot, u8 pin);
 };
 
 /*
@@ -44,7 +44,7 @@ struct pci_sys_data {
                                         /* Bridge swizzling                     */
         u8              (*swizzle)(struct pci_dev *, u8 *);
                                         /* IRQ mapping                          */
-        int             (*map_irq)(struct pci_dev *, u8, u8);
+        int             (*map_irq)(const struct pci_dev *, u8, u8);
         struct hw_pci   *hw;
         void            *private_data;  /* platform controller private data     */
 };