Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[linux-2.6.git] / arch / arm / mach-ixp4xx / include / mach / hardware.h
index 1fbed65..8138371 100644 (file)
 #define PCIBIOS_MAX_MEM                0x4BFFFFFF
 #endif
 
-/*
- * We override the standard dma-mask routines for bouncing.
- */
-#define        HAVE_ARCH_PCI_SET_DMA_MASK
+#define ARCH_HAS_DMA_SET_COHERENT_MASK
 
 #define pcibios_assign_all_busses()    1
 
 /* Platform helper functions and definitions */
 #include "platform.h"
 
-/* Platform specific details */
-#include "prpmc1100.h"
-#include "nslu2.h"
-#include "nas100d.h"
-#include "dsmg600.h"
-#include "fsg.h"
-
 #endif  /* _ASM_ARCH_HARDWARE_H */