summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/boot/compressed/.gitignore (renamed from arch/i386/boot/compressed/.gitignore)0
-rw-r--r--arch/x86/boot/compressed/Makefile (renamed from arch/i386/boot/compressed/Makefile)2
-rw-r--r--arch/x86/boot/compressed/Makefile_32 (renamed from arch/i386/boot/compressed/Makefile_32)2
-rw-r--r--arch/x86/boot/compressed/head_32.S (renamed from arch/i386/boot/compressed/head_32.S)0
-rw-r--r--arch/x86/boot/compressed/misc_32.c (renamed from arch/i386/boot/compressed/misc_32.c)0
-rw-r--r--arch/x86/boot/compressed/relocs.c (renamed from arch/i386/boot/compressed/relocs.c)0
-rw-r--r--arch/x86/boot/compressed/vmlinux_32.lds (renamed from arch/i386/boot/compressed/vmlinux_32.lds)0
-rw-r--r--arch/x86/boot/compressed/vmlinux_32.scr (renamed from arch/i386/boot/compressed/vmlinux_32.scr)0
-rw-r--r--arch/x86_64/boot/compressed/Makefile2
9 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/boot/compressed/.gitignore b/arch/x86/boot/compressed/.gitignore
index be0ed065249b..be0ed065249b 100644
--- a/arch/i386/boot/compressed/.gitignore
+++ b/arch/x86/boot/compressed/.gitignore
diff --git a/arch/i386/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 78514f3f626f..76ab5caddf9a 100644
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -1,5 +1,5 @@
ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/boot/compressed/Makefile_32
+include ${srctree}/arch/x86/boot/compressed/Makefile_32
else
include ${srctree}/arch/x86_64/boot/compressed/Makefile_64
endif
diff --git a/arch/i386/boot/compressed/Makefile_32 b/arch/x86/boot/compressed/Makefile_32
index 0c64c314eadb..22613c652d22 100644
--- a/arch/i386/boot/compressed/Makefile_32
+++ b/arch/x86/boot/compressed/Makefile_32
@@ -1,5 +1,5 @@
#
-# linux/arch/i386/boot/compressed/Makefile
+# linux/arch/x86/boot/compressed/Makefile
#
# create a compressed vmlinux image from the original vmlinux
#
diff --git a/arch/i386/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index f35ea2237522..f35ea2237522 100644
--- a/arch/i386/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
diff --git a/arch/i386/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c
index b28505c544c9..b28505c544c9 100644
--- a/arch/i386/boot/compressed/misc_32.c
+++ b/arch/x86/boot/compressed/misc_32.c
diff --git a/arch/i386/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index 2d77ee728f92..2d77ee728f92 100644
--- a/arch/i386/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
diff --git a/arch/i386/boot/compressed/vmlinux_32.lds b/arch/x86/boot/compressed/vmlinux_32.lds
index cc4854f6c6c1..cc4854f6c6c1 100644
--- a/arch/i386/boot/compressed/vmlinux_32.lds
+++ b/arch/x86/boot/compressed/vmlinux_32.lds
diff --git a/arch/i386/boot/compressed/vmlinux_32.scr b/arch/x86/boot/compressed/vmlinux_32.scr
index 707a88f7f29e..707a88f7f29e 100644
--- a/arch/i386/boot/compressed/vmlinux_32.scr
+++ b/arch/x86/boot/compressed/vmlinux_32.scr
diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile
index 78514f3f626f..76ab5caddf9a 100644
--- a/arch/x86_64/boot/compressed/Makefile
+++ b/arch/x86_64/boot/compressed/Makefile
@@ -1,5 +1,5 @@
ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/boot/compressed/Makefile_32
+include ${srctree}/arch/x86/boot/compressed/Makefile_32
else
include ${srctree}/arch/x86_64/boot/compressed/Makefile_64
endif
OpenPOWER on IntegriCloud