diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-14 17:24:51 -0400 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /include/linux/pci.h | |
| parent | b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff) | |
| parent | d5120ae72a066b18f98e0c45ce73262f58030851 (diff) | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index c0e14008a3c2..98dc6243a706 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -534,7 +534,7 @@ extern void pci_sort_breadthfirst(void); | |||
| 534 | #ifdef CONFIG_PCI_LEGACY | 534 | #ifdef CONFIG_PCI_LEGACY |
| 535 | struct pci_dev __deprecated *pci_find_device(unsigned int vendor, | 535 | struct pci_dev __deprecated *pci_find_device(unsigned int vendor, |
| 536 | unsigned int device, | 536 | unsigned int device, |
| 537 | const struct pci_dev *from); | 537 | struct pci_dev *from); |
| 538 | struct pci_dev __deprecated *pci_find_slot(unsigned int bus, | 538 | struct pci_dev __deprecated *pci_find_slot(unsigned int bus, |
| 539 | unsigned int devfn); | 539 | unsigned int devfn); |
| 540 | #endif /* CONFIG_PCI_LEGACY */ | 540 | #endif /* CONFIG_PCI_LEGACY */ |
| @@ -550,7 +550,7 @@ struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, | |||
| 550 | struct pci_dev *from); | 550 | struct pci_dev *from); |
| 551 | struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, | 551 | struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, |
| 552 | unsigned int ss_vendor, unsigned int ss_device, | 552 | unsigned int ss_vendor, unsigned int ss_device, |
| 553 | const struct pci_dev *from); | 553 | struct pci_dev *from); |
| 554 | struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn); | 554 | struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn); |
| 555 | struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn); | 555 | struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn); |
| 556 | struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from); | 556 | struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from); |
| @@ -816,7 +816,7 @@ _PCI_NOP_ALL(write,) | |||
| 816 | 816 | ||
| 817 | static inline struct pci_dev *pci_find_device(unsigned int vendor, | 817 | static inline struct pci_dev *pci_find_device(unsigned int vendor, |
| 818 | unsigned int device, | 818 | unsigned int device, |
| 819 | const struct pci_dev *from) | 819 | struct pci_dev *from) |
| 820 | { | 820 | { |
| 821 | return NULL; | 821 | return NULL; |
| 822 | } | 822 | } |
| @@ -838,7 +838,7 @@ static inline struct pci_dev *pci_get_subsys(unsigned int vendor, | |||
| 838 | unsigned int device, | 838 | unsigned int device, |
| 839 | unsigned int ss_vendor, | 839 | unsigned int ss_vendor, |
| 840 | unsigned int ss_device, | 840 | unsigned int ss_device, |
| 841 | const struct pci_dev *from) | 841 | struct pci_dev *from) |
| 842 | { | 842 | { |
| 843 | return NULL; | 843 | return NULL; |
| 844 | } | 844 | } |