X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Flinux%2Fpci.h;h=a90f940207982618e424ec19d017dd163a32be78;hb=711d57796f5ce2d02d6e62c9034afbb16aedda31;hp=d304ddf412d064750956d9ee689fcb42a4b86706;hpb=5c5d4e8eafd0e54c2134c23296b1d7996c304fe1;p=deliverable%2Flinux.git diff --git a/include/linux/pci.h b/include/linux/pci.h index d304ddf412d0..a90f94020798 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -276,6 +276,7 @@ struct pci_dev { unsigned int state_saved:1; unsigned int is_physfn:1; unsigned int is_virtfn:1; + unsigned int reset_fn:1; pci_dev_flags_t dev_flags; atomic_t enable_cnt; /* pci_enable_device has been called */ @@ -1145,7 +1146,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); }