diff --git a/[refs] b/[refs] index 98e28ce6a91f..a4ac19f435ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c65f459ce6c8bd873a61b3ae1e57858ab1debf3 +refs/heads/master: dd438e77f01d024919a8ae81d0cf2e4c6cda79cc diff --git a/trunk/include/asm-arm/pci.h b/trunk/include/asm-arm/pci.h index 75feb1574a69..2d84792f2e12 100644 --- a/trunk/include/asm-arm/pci.h +++ b/trunk/include/asm-arm/pci.h @@ -78,6 +78,14 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) return root; } +/* + * Dummy implementation; always return 0. + */ +static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) +{ + return 0; +} + #endif /* __KERNEL__ */ #endif