[PATCH] preparation to m68k header move

[Al Viro]

sort out two non-trivial include from m68knommu to m68k headers

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
 arch/m68knommu/include/asm/pci.h   |    8 +++++++-
 arch/m68knommu/include/asm/setup.h |    9 ---------
 include/asm-m68k/setup.h           |    4 ++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/arch/m68knommu/include/asm/pci.h b/arch/m68knommu/include/asm/pci.h
index a13f3cc..ad8bd5e 100644
--- a/arch/m68knommu/include/asm/pci.h
+++ b/arch/m68knommu/include/asm/pci.h
@@ -1,7 +1,13 @@
 #ifndef M68KNOMMU_PCI_H
 #define	M68KNOMMU_PCI_H
 
-#include <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)
 
 #ifdef CONFIG_COMEMPCI
 /*
diff --git a/arch/m68knommu/include/asm/setup.h b/arch/m68knommu/include/asm/setup.h
index fb86bb2..ff4565e 100644
--- a/arch/m68knommu/include/asm/setup.h
+++ b/arch/m68knommu/include/asm/setup.h
@@ -1,10 +1 @@
-#ifdef __KERNEL__
-
 #include <asm-m68k/setup.h>
-
-/* We have a bigger command line buffer. */
-#undef COMMAND_LINE_SIZE
-
-#endif  /*  __KERNEL__  */
-
-#define COMMAND_LINE_SIZE	512
diff --git a/include/asm-m68k/setup.h b/include/asm-m68k/setup.h
index 4dfb395..1029d59 100644
--- a/include/asm-m68k/setup.h
+++ b/include/asm-m68k/setup.h
@@ -41,7 +41,11 @@
 #define MACH_Q40     10
 #define MACH_SUN3X   11
 
+#ifdef CONFIG_MMU
 #define COMMAND_LINE_SIZE 256
+#else
+#define COMMAND_LINE_SIZE 512
+#endif
 
 #ifdef __KERNEL__
 
-- 
1.5.6.5