diff --git a/[refs] b/[refs] index ab4b958af7dd..60f8a2ed5108 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bffadffd43d438c3143b8d172a463de89345b836 +refs/heads/master: a7b930cdf8ec790c85f81416c87f7c066679d373 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index c75b82bda327..feb4657bb043 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -1136,7 +1136,7 @@ static inline void pci_mmcfg_late_init(void) { } #endif #ifdef CONFIG_HAS_IOMEM -static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar) +static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) { /* * Make sure the BAR is actually a memory resource, not an IO resource