From 6453083badbdd745ef4c5974eb5396db82691edf Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sat, 4 Mar 2006 21:52:42 -0500 Subject: [PATCH] --- yaml --- r: 23219 b: refs/heads/master c: 3c990e9219ea0b0aee588473ce6c8a66cdee3ff5 h: refs/heads/master i: 23217: 4a36caf98543e04af81b90d28133eaa9b28bd2c3 23215: 3ac8a25a8825569606d812c32b8484827cc1ed35 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 4 ++-- trunk/include/linux/pci.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f8699d9d6fac..8e9865764ac9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 309e57df7b766172ba137a8cbd909f88dd76e8e9 +refs/heads/master: 3c990e9219ea0b0aee588473ce6c8a66cdee3ff5 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 03af23238939..bea1ad1ad5ba 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -639,7 +639,7 @@ void pci_release_region(struct pci_dev *pdev, int bar) * Returns 0 on success, or %EBUSY on error. A warning * message is also printed on failure. */ -int pci_request_region(struct pci_dev *pdev, int bar, char *res_name) +int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name) { if (pci_resource_len(pdev, bar) == 0) return 0; @@ -697,7 +697,7 @@ void pci_release_regions(struct pci_dev *pdev) * Returns 0 on success, or %EBUSY on error. A warning * message is also printed on failure. */ -int pci_request_regions(struct pci_dev *pdev, char *res_name) +int pci_request_regions(struct pci_dev *pdev, const char *res_name) { int i; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index d4d533fa5d30..0aad5a378e95 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -490,9 +490,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *); void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *), int (*)(struct pci_dev *, u8, u8)); #define HAVE_PCI_REQ_REGIONS 2 -int pci_request_regions(struct pci_dev *, char *); +int pci_request_regions(struct pci_dev *, const char *); void pci_release_regions(struct pci_dev *); -int pci_request_region(struct pci_dev *, int, char *); +int pci_request_region(struct pci_dev *, int, const char *); void pci_release_region(struct pci_dev *, int); /* drivers/pci/bus.c */