---

yaml
---
r: 131084
b: refs/heads/master
c: a2b7b01
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a3db1cec5d476804185114ff5d1845aed3936b3
+refs/heads/master: a2b7b01c072435b7832ab392167545a1b38cabc3

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc2
 NAME = Erotic Pickled Herring
 
 # *DOCUMENTATION*

trunk/arch/m68k/include/asm/cacheflush_no.h

@@ -51,20 +51,13 @@ static inline void __flush_cache_all(void)
 		"movec	%%d0,%%CACR\n\t"
 		: : : "d0", "a0" );
 #endif /* CONFIG_M5407 */
-#if defined(CONFIG_M523x) || defined(CONFIG_M527x)
-	__asm__ __volatile__ (
-		"movel	#0x81400100, %%d0\n\t"
-		"movec	%%d0, %%CACR\n\t"
-		"nop\n\t"
-		: : : "d0" );
-#endif /* CONFIG_M523x || CONFIG_M527x */
-#if defined(CONFIG_M528x)
+#if defined(CONFIG_M527x) || defined(CONFIG_M528x)
 	__asm__ __volatile__ (
 		"movel	#0x81000200, %%d0\n\t"
 		"movec	%%d0, %%CACR\n\t"
 		"nop\n\t"
 		: : : "d0" );
-#endif /* CONFIG_M528x */
+#endif /* CONFIG_M527x || CONFIG_M528x */
 #if defined(CONFIG_M5206) || defined(CONFIG_M5206e) || defined(CONFIG_M5272)
 	__asm__ __volatile__ (
 		"movel	#0x81000100, %%d0\n\t"

trunk/arch/m68k/include/asm/dma-mapping_no.h

@@ -1,6 +1,10 @@
 #ifndef _M68KNOMMU_DMA_MAPPING_H
 #define _M68KNOMMU_DMA_MAPPING_H
 
+#ifdef CONFIG_PCI
+#include <asm-generic/dma-mapping.h>
+#else
 #include <asm-generic/dma-mapping-broken.h>
+#endif
 
 #endif  /* _M68KNOMMU_DMA_MAPPING_H */

trunk/arch/m68k/include/asm/system_no.h

@@ -230,7 +230,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
         jmp 0xf0000400;			\
         ");				\
 })
-#elif defined(CONFIG_NETtel) || \
+#elif defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
       defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
 #define HARD_RESET_NOW() ({		\
         asm("				\

trunk/arch/m68knommu/Kconfig

@@ -14,10 +14,6 @@ config MMU
 	bool
 	default n
 
-config NO_DMA
-	bool
-	default y
-
 config FPU
 	bool
 	default n
@@ -402,6 +398,12 @@ config M5307C3
 	help
 	  Support for the Motorola M5307C3 board.
 
+config eLIA
+	bool "Moreton Bay eLIA board support"
+	depends on M5307
+	help
+	  Support for the Moreton Bay eLIA board.
+
 config SECUREEDGEMP3
 	bool "SnapGear SecureEdge/MP3 platform support"
 	depends on M5307
@@ -695,8 +697,25 @@ config ISA_DMA_API
 	depends on !M5272
 	default y
 
+menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
+
+config PCI
+	bool "PCI support"
+	help
+	  Support for PCI bus.
+
+config COMEMPCI
+	bool "CO-MEM lite PCI controller support"
+	depends on (M5307 || M5407)
+
+source "drivers/pci/Kconfig"
+
 source "drivers/pcmcia/Kconfig"
 
+source "drivers/pci/hotplug/Kconfig"
+
+endmenu
+
 menu "Executable file formats"
 
 source "fs/Kconfig.binfmt"

trunk/arch/m68knommu/Makefile

@@ -41,6 +41,7 @@ board-$(CONFIG_M5271EVB)	:= M5271EVB
 board-$(CONFIG_M5275EVB)	:= M5275EVB
 board-$(CONFIG_M5282EVB)	:= M5282EVB
 board-$(CONFIG_ELITE)		:= eLITE
+board-$(CONFIG_eLIA)		:= eLIA
 board-$(CONFIG_NETtel)		:= NETtel
 board-$(CONFIG_SECUREEDGEMP3)	:= MP3
 board-$(CONFIG_CLEOPATRA)	:= CLEOPATRA

trunk/arch/m68knommu/kernel/Makefile

@@ -8,3 +8,4 @@ obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \
 	 setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o
 
 obj-$(CONFIG_MODULES)	+= module.o
+obj-$(CONFIG_COMEMPCI)	+= comempci.o