diff options
| -rw-r--r-- | drivers/pci/pci.c | 4 | ||||
| -rw-r--r-- | include/linux/pci.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 03af232389..bea1ad1ad5 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -639,7 +639,7 @@ void pci_release_region(struct pci_dev *pdev, int bar) | |||
| 639 | * Returns 0 on success, or %EBUSY on error. A warning | 639 | * Returns 0 on success, or %EBUSY on error. A warning |
| 640 | * message is also printed on failure. | 640 | * message is also printed on failure. |
| 641 | */ | 641 | */ |
| 642 | int pci_request_region(struct pci_dev *pdev, int bar, char *res_name) | 642 | int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) |
| 643 | { | 643 | { |
| 644 | if (pci_resource_len(pdev, bar) == 0) | 644 | if (pci_resource_len(pdev, bar) == 0) |
| 645 | return 0; | 645 | return 0; |
| @@ -697,7 +697,7 @@ void pci_release_regions(struct pci_dev *pdev) | |||
| 697 | * Returns 0 on success, or %EBUSY on error. A warning | 697 | * Returns 0 on success, or %EBUSY on error. A warning |
| 698 | * message is also printed on failure. | 698 | * message is also printed on failure. |
| 699 | */ | 699 | */ |
| 700 | int pci_request_regions(struct pci_dev *pdev, char *res_name) | 700 | int pci_request_regions(struct pci_dev *pdev, const char *res_name) |
| 701 | { | 701 | { |
| 702 | int i; | 702 | int i; |
| 703 | 703 | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index d4d533fa5d..0aad5a378e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -490,9 +490,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *); | |||
| 490 | void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), | 490 | void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), |
| 491 | int (*)(struct pci_dev *, u8, u8)); | 491 | int (*)(struct pci_dev *, u8, u8)); |
| 492 | #define HAVE_PCI_REQ_REGIONS 2 | 492 | #define HAVE_PCI_REQ_REGIONS 2 |
| 493 | int pci_request_regions(struct pci_dev *, char *); | 493 | int pci_request_regions(struct pci_dev *, const char *); |
| 494 | void pci_release_regions(struct pci_dev *); | 494 | void pci_release_regions(struct pci_dev *); |
| 495 | int pci_request_region(struct pci_dev *, int, char *); | 495 | int pci_request_region(struct pci_dev *, int, const char *); |
| 496 | void pci_release_region(struct pci_dev *, int); | 496 | void pci_release_region(struct pci_dev *, int); |
| 497 | 497 | ||
| 498 | /* drivers/pci/bus.c */ | 498 | /* drivers/pci/bus.c */ |
