diff --git a/[refs] b/[refs] index 6aa058178c38..a6d48c9c1063 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a661c6f1082693a7e9627e9ad2d1546a9337fdc +refs/heads/master: 2fc90f6133a87da8177636866557d4cc5f56e661 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index d304ddf412d0..115fb7ba5089 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -1145,7 +1145,7 @@ static inline void pci_set_drvdata(struct pci_dev *pdev, void *data) /* If you want to know what to call your pci_dev, ask this function. * Again, it's a wrapper around the generic device. */ -static inline const char *pci_name(struct pci_dev *pdev) +static inline const char *pci_name(const struct pci_dev *pdev) { return dev_name(&pdev->dev); }