diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:27:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 06:27:51 +0200 |
| commit | 141dc40ee343ab532717b235dd645e2d25ae3092 (patch) | |
| tree | 2289e5d1ec20df5e465b9b629e291877f4d70485 /arch/mn10300/include/asm/pci.h | |
| parent | Merge tag 'for-usb-next-2013-06-06' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Linux 3.10-rc5 (diff) | |
| download | linux-141dc40ee343ab532717b235dd645e2d25ae3092.tar.xz linux-141dc40ee343ab532717b235dd645e2d25ae3092.zip | |
Merge 3.10-rc5 into usb-next
We need the changes in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mn10300/include/asm/pci.h')
| -rw-r--r-- | arch/mn10300/include/asm/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 8137c25c4e15..6f31cc0f1a87 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h @@ -103,4 +103,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) return channel ? 15 : 14; } +#include <asm-generic/pci_iomap.h> + #endif /* _ASM_PCI_H */ |