---

yaml --- r: 10450 b: refs/heads/master c: 0b83f14 h: refs/heads/master v: v3
git-mirror · Oct 28, 2005 · 9f5db81 · 9f5db81
1 parent d15c5d2
commit 9f5db81
Show file tree

Hide file tree

Showing 12 changed files with 1,408 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b57235215933d5fde4013e2448223b934b4ac2b7
+refs/heads/master: 0b83f1400fa6e5f0d4afcff033628a16c163862a
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -687,7 +687,8 @@ source "drivers/acorn/block/Kconfig"
 
 if PCMCIA || ARCH_CLPS7500 || ARCH_IOP3XX || ARCH_IXP4XX \
 	|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
-	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE
+	|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
+	|| MACH_MP1000
 source "drivers/ide/Kconfig"
 endif
 

diff --git a/trunk/arch/arm/boot/compressed/head.S b/trunk/arch/arm/boot/compressed/head.S
@@ -39,7 +39,8 @@
     defined(CONFIG_ARCH_IXP4XX) || \
     defined(CONFIG_ARCH_IXP2000) || \
     defined(CONFIG_ARCH_LH7A40X) || \
-    defined(CONFIG_ARCH_OMAP)
+    defined(CONFIG_ARCH_OMAP) || \
+    defined(CONFIG_MACH_MP1000)
 		.macro	loadsp,	rb
 		addruart \rb
 		.endm