aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/ioport.h2
-rw-r--r--include/linux/pci.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index f4195de4eb9d..4a811891dbe3 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -121,7 +121,7 @@ extern int allocate_resource(struct resource *root, struct resource *new,
121 resource_size_t size, resource_size_t min, 121 resource_size_t size, resource_size_t min,
122 resource_size_t max, resource_size_t align, 122 resource_size_t max, resource_size_t align,
123 resource_size_t (*alignf)(void *, 123 resource_size_t (*alignf)(void *,
124 struct resource *, 124 const struct resource *,
125 resource_size_t, 125 resource_size_t,
126 resource_size_t), 126 resource_size_t),
127 void *alignf_data); 127 void *alignf_data);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1bd9f52b24b8..449d51560fc2 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -592,7 +592,7 @@ int __must_check pcibios_enable_device(struct pci_dev *, int mask);
592char *pcibios_setup(char *str); 592char *pcibios_setup(char *str);
593 593
594/* Used only when drivers/pci/setup.c is used */ 594/* Used only when drivers/pci/setup.c is used */
595resource_size_t pcibios_align_resource(void *, struct resource *, 595resource_size_t pcibios_align_resource(void *, const struct resource *,
596 resource_size_t, 596 resource_size_t,
597 resource_size_t); 597 resource_size_t);
598void pcibios_update_irq(struct pci_dev *, int irq); 598void pcibios_update_irq(struct pci_dev *, int irq);
@@ -828,7 +828,8 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
828 struct resource *res, resource_size_t size, 828 struct resource *res, resource_size_t size,
829 resource_size_t align, resource_size_t min, 829 resource_size_t align, resource_size_t min,
830 unsigned int type_mask, 830 unsigned int type_mask,
831 resource_size_t (*alignf)(void *, struct resource *, 831 resource_size_t (*alignf)(void *,
832 const struct resource *,
832 resource_size_t, 833 resource_size_t,
833 resource_size_t), 834 resource_size_t),
834 void *alignf_data); 835 void *alignf_data);