Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
b24b10d7 · Linus Torvalds · 0ac3fc9f · 5a9f7c9f · b24b10d7
Commit b24b10d7 authored Jul 06, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

arch/sparc64/kernel/head.S arch/sparc64/kernel/head.S +0 -1

No files found.
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -50,7 +50,6 @@ bootup_user_stack:
 */
        .global root_flags, ram_flags, root_dev
        .global sparc_ramdisk_image, sparc_ramdisk_size
-	.globl	silo_args

        .ascii  "HdrS"
        .word   LINUX_VERSION_CODE