Skip to content

Commit

Permalink
m68k: use the mmu pci.h for m68knommu as well
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Ungerer committed Mar 24, 2009
1 parent bf5fe9e commit 76fdb7d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 46 deletions.
17 changes: 12 additions & 5 deletions arch/m68k/include/asm/pci.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#ifdef __uClinux__
#include "pci_no.h"
#else
#include "pci_mm.h"
#endif
#ifndef _ASM_M68K_PCI_H
#define _ASM_M68K_PCI_H

#include <asm-generic/pci-dma-compat.h>

/* The PCI address space does equal the physical memory
* address space. The networking and block device layers use
* this boolean for bounce buffer decisions.
*/
#define PCI_DMA_BUS_IS_PHYS (1)

#endif /* _ASM_M68K_PCI_H */
12 changes: 0 additions & 12 deletions arch/m68k/include/asm/pci_mm.h

This file was deleted.

29 changes: 0 additions & 29 deletions arch/m68k/include/asm/pci_no.h

This file was deleted.

0 comments on commit 76fdb7d

Please sign in to comment.