tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
m68k: use the mmu pci.h for m68knommu as well
The (m68knommu) COMEMPCI support has been removed from the kernel,
so now the mmu pci.h can be used on non-mmu setups as well.
Remove the non-mmu pci_no.h and revert the pci_mm.h to be pci.h.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
+12
-46
+12
-5
arch/m68k/include/asm/pci.h
+12
-5
arch/m68k/include/asm/pci.h
···
1
-
#ifdef __uClinux__
2
-
#include "pci_no.h"
3
-
#else
4
-
#include "pci_mm.h"
5
-
#endif
1
+
#ifndef _ASM_M68K_PCI_H
2
+
#define _ASM_M68K_PCI_H
3
+
4
+
#include <asm-generic/pci-dma-compat.h>
5
+
6
+
/* The PCI address space does equal the physical memory
7
+
* address space. The networking and block device layers use
8
+
* this boolean for bounce buffer decisions.
9
+
*/
10
+
#define PCI_DMA_BUS_IS_PHYS (1)
11
+
12
+
#endif /* _ASM_M68K_PCI_H */
-12
arch/m68k/include/asm/pci_mm.h
-12
arch/m68k/include/asm/pci_mm.h
···
1
-
#ifndef _ASM_M68K_PCI_H
2
-
#define _ASM_M68K_PCI_H
3
-
4
-
#include <asm-generic/pci-dma-compat.h>
5
-
6
-
/* The PCI address space does equal the physical memory
7
-
* address space. The networking and block device layers use
8
-
* this boolean for bounce buffer decisions.
9
-
*/
10
-
#define PCI_DMA_BUS_IS_PHYS (1)
11
-
12
-
#endif /* _ASM_M68K_PCI_H */
-29
arch/m68k/include/asm/pci_no.h
-29
arch/m68k/include/asm/pci_no.h
···
1
-
#ifndef M68KNOMMU_PCI_H
2
-
#define M68KNOMMU_PCI_H
3
-
4
-
#include <asm/pci_mm.h>
5
-
6
-
#ifdef CONFIG_COMEMPCI
7
-
/*
8
-
* These are pretty much arbitary with the CoMEM implementation.
9
-
* We have the whole address space to ourselves.
10
-
*/
11
-
#define PCIBIOS_MIN_IO 0x100
12
-
#define PCIBIOS_MIN_MEM 0x00010000
13
-
14
-
#define pcibios_scan_all_fns(a, b) 0
15
-
16
-
/*
17
-
* Return whether the given PCI device DMA address mask can
18
-
* be supported properly. For example, if your device can
19
-
* only drive the low 24-bits during PCI bus mastering, then
20
-
* you would pass 0x00ffffff as the mask to this function.
21
-
*/
22
-
static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
23
-
{
24
-
return 1;
25
-
}
26
-
27
-
#endif /* CONFIG_COMEMPCI */
28
-
29
-
#endif /* M68KNOMMU_PCI_H */