diff --git a/[refs] b/[refs] index e90804f866f7..5ca3f40b377d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51a6b0c59a6170fc6a40221ef9b261b82856d315 +refs/heads/master: 7c5131a501e9e8549f74d807c37fde76008ef95a diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile index e93f4ee14719..f2a0c40a9204 100644 --- a/trunk/arch/um/Makefile +++ b/trunk/arch/um/Makefile @@ -17,7 +17,7 @@ core-y += $(ARCH_DIR)/kernel/ \ # Have to precede the include because the included Makefiles reference them. SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \ - arch-signal.h module.h vm-flags.h elf.h + module.h vm-flags.h elf.h SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes diff --git a/trunk/include/asm-um/arch-signal-i386.h b/trunk/include/asm-um/arch-signal-i386.h index 99a9de4728da..e69de29bb2d1 100644 --- a/trunk/include/asm-um/arch-signal-i386.h +++ b/trunk/include/asm-um/arch-signal-i386.h @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef __UM_ARCH_SIGNAL_I386_H -#define __UM_ARCH_SIGNAL_I386_H - -struct arch_signal_context { - unsigned long extrasigs[_NSIG_WORDS]; -}; - -#endif - -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */