From ed1912b1502c38082e670d76ecfecd09676ff8c2 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Wed, 30 Jan 2008 13:33:38 +0100
Subject: [PATCH] --- yaml --- r: 80413 b: refs/heads/master c:
 f18c0e792057059eab9a8ce929af424ff8a4a90f h: refs/heads/master i:   80411:
 b52add83ff825a76e4f5f81a088e4b9f218f00b9 v: v3

---
 [refs]                                                 |  2 +-
 trunk/arch/x86/boot/compressed/Makefile                |  2 +-
 .../boot/compressed/{vmlinux_32.scr => vmlinux.scr}    |  0
 trunk/arch/x86/boot/compressed/vmlinux_64.scr          | 10 ----------
 4 files changed, 2 insertions(+), 12 deletions(-)
 rename trunk/arch/x86/boot/compressed/{vmlinux_32.scr => vmlinux.scr} (100%)
 delete mode 100644 trunk/arch/x86/boot/compressed/vmlinux_64.scr

diff --git a/[refs] b/[refs]
index a3c30f4aa966..f928fa46f812 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20514e9f6e6221884afada04fbbbde651d3d8654
+refs/heads/master: f18c0e792057059eab9a8ce929af424ff8a4a90f
diff --git a/trunk/arch/x86/boot/compressed/Makefile b/trunk/arch/x86/boot/compressed/Makefile
index d6ae347d11f1..baffeafa798f 100644
--- a/trunk/arch/x86/boot/compressed/Makefile
+++ b/trunk/arch/x86/boot/compressed/Makefile
@@ -59,5 +59,5 @@ LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T
 endif
 
 
-$(obj)/piggy.o: $(obj)/vmlinux_$(BITS).scr $(obj)/vmlinux.bin.gz FORCE
+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
 	$(call if_changed,ld)
diff --git a/trunk/arch/x86/boot/compressed/vmlinux_32.scr b/trunk/arch/x86/boot/compressed/vmlinux.scr
similarity index 100%
rename from trunk/arch/x86/boot/compressed/vmlinux_32.scr
rename to trunk/arch/x86/boot/compressed/vmlinux.scr
diff --git a/trunk/arch/x86/boot/compressed/vmlinux_64.scr b/trunk/arch/x86/boot/compressed/vmlinux_64.scr
deleted file mode 100644
index f02382ae5c48..000000000000
--- a/trunk/arch/x86/boot/compressed/vmlinux_64.scr
+++ /dev/null
@@ -1,10 +0,0 @@
-SECTIONS
-{
-  .rodata.compressed : {
-	input_len = .;
-	LONG(input_data_end - input_data) input_data = .;
-	*(.data)
-	output_len = . - 4;
-	input_data_end = .;
-	}
-}