diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
| tree | d498e947176f4b77938034ff6c6427f9875da721 /arch/m68knommu/include/asm/pci.h | |
| parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
| parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,m68knommu: merge header files
Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild
Diffstat (limited to 'arch/m68knommu/include/asm/pci.h')
| -rw-r--r-- | arch/m68knommu/include/asm/pci.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/arch/m68knommu/include/asm/pci.h b/arch/m68knommu/include/asm/pci.h deleted file mode 100644 index a13f3cc8745..00000000000 --- a/arch/m68knommu/include/asm/pci.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef M68KNOMMU_PCI_H -#define M68KNOMMU_PCI_H - -#include <asm-m68k/pci.h> - -#ifdef CONFIG_COMEMPCI -/* - * These are pretty much arbitary with the CoMEM implementation. - * We have the whole address space to ourselves. - */ -#define PCIBIOS_MIN_IO 0x100 -#define PCIBIOS_MIN_MEM 0x00010000 - -#define pcibios_scan_all_fns(a, b) 0 - -/* - * Return whether the given PCI device DMA address mask can - * be supported properly. For example, if your device can - * only drive the low 24-bits during PCI bus mastering, then - * you would pass 0x00ffffff as the mask to this function. - */ -static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask) -{ - return 1; -} - -#endif /* CONFIG_COMEMPCI */ - -#endif /* M68KNOMMU_PCI_H */ |