diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:26:52 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-13 16:26:52 +0100 |
commit | 47258cf3c4aa5d56e678bafe0dd0d03ddd980b88 (patch) | |
tree | 4856f0fb1185ba97f320a7ed6fb63bf136708a42 /include/asm-generic/pci_iomap.h | |
parent | c308b56b5398779cd3da0f62ab26b0453494c3d4 (diff) | |
parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
download | linux-3.10-47258cf3c4aa5d56e678bafe0dd0d03ddd980b88.tar.gz linux-3.10-47258cf3c4aa5d56e678bafe0dd0d03ddd980b88.tar.bz2 linux-3.10-47258cf3c4aa5d56e678bafe0dd0d03ddd980b88.zip |
Merge tag 'v3.3-rc7' into sched/core
Merge reason: merge back final fixes, prepare for the merge window.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-generic/pci_iomap.h')
-rw-r--r-- | include/asm-generic/pci_iomap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h index e58fcf89137..ce37349860f 100644 --- a/include/asm-generic/pci_iomap.h +++ b/include/asm-generic/pci_iomap.h @@ -25,7 +25,7 @@ extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port, #define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr)) #endif -#else +#elif defined(CONFIG_GENERIC_PCI_IOMAP) static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) { return NULL; |