---

yaml --- r: 65547 b: refs/heads/master c: 9c20194 h: refs/heads/master i: 65545: 11771aa 65543: 7d012e8 v: v3
git-mirror · Oct 11, 2007 · 575f658 · 575f658
1 parent bf2c675
commit 575f658
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af49d41e8c0e6649b3966470aa6319585144f8e8
+refs/heads/master: 9c2019421511a1bc646981d55528334ae46464c0
diff --git a/trunk/arch/i386/Makefile b/trunk/arch/i386/Makefile
@@ -105,7 +105,7 @@ libs-y 					+= arch/i386/lib/
 core-y					+= arch/i386/kernel/ \
 					   arch/i386/mm/ \
 					   $(mcore-y)/ \
-					   arch/i386/crypto/
+					   arch/x86/crypto/
 drivers-$(CONFIG_MATH_EMULATION)	+= arch/i386/math-emu/
 drivers-$(CONFIG_PCI)			+= arch/i386/pci/
 # must be linked after kernel/

diff --git a/trunk/arch/i386/crypto/Makefile → trunk/arch/x86/crypto/Makefile b/trunk/arch/i386/crypto/Makefile → trunk/arch/x86/crypto/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/crypto/Makefile_32
+include ${srctree}/arch/x86/crypto/Makefile_32
 else
 include ${srctree}/arch/x86_64/crypto/Makefile_64
 endif
diff --git a/trunk/arch/i386/crypto/Makefile_32 → trunk/arch/x86/crypto/Makefile_32 b/trunk/arch/i386/crypto/Makefile_32 → trunk/arch/x86/crypto/Makefile_32
@@ -1,5 +1,5 @@
 # 
-# i386/crypto/Makefile 
+# x86/crypto/Makefile 
 # 
 # Arch-specific CryptoAPI modules.
 # 

diff --git a/trunk/arch/i386/crypto/aes-i586-asm_32.S → trunk/arch/x86/crypto/aes-i586-asm_32.S b/trunk/arch/i386/crypto/aes-i586-asm_32.S → trunk/arch/x86/crypto/aes-i586-asm_32.S
diff --git a/trunk/arch/i386/crypto/aes_32.c → trunk/arch/x86/crypto/aes_32.c b/trunk/arch/i386/crypto/aes_32.c → trunk/arch/x86/crypto/aes_32.c
diff --git a/trunk/arch/i386/crypto/twofish-i586-asm_32.S → trunk/arch/x86/crypto/twofish-i586-asm_32.S b/trunk/arch/i386/crypto/twofish-i586-asm_32.S → trunk/arch/x86/crypto/twofish-i586-asm_32.S
diff --git a/trunk/arch/i386/crypto/twofish_32.c → trunk/arch/x86/crypto/twofish_32.c b/trunk/arch/i386/crypto/twofish_32.c → trunk/arch/x86/crypto/twofish_32.c
diff --git a/trunk/arch/x86_64/crypto/Makefile b/trunk/arch/x86_64/crypto/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/crypto/Makefile_32
+include ${srctree}/arch/x86/crypto/Makefile_32
 else
 include ${srctree}/arch/x86_64/crypto/Makefile_64
 endif