diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/um/kernel/sysrq.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/um/kernel/sysrq.c')
| -rw-r--r-- | arch/um/kernel/sysrq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c index f9e02b31a97a..93263571d813 100644 --- a/arch/um/kernel/sysrq.c +++ b/arch/um/kernel/sysrq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include "asm/page.h" | 10 | #include "asm/page.h" |
| 11 | #include "asm/processor.h" | 11 | #include "asm/processor.h" |
| 12 | #include "sysrq.h" | 12 | #include "sysrq.h" |
| 13 | #include "user_util.h" | ||
| 14 | 13 | ||
| 15 | /* Catch non-i386 SUBARCH's. */ | 14 | /* Catch non-i386 SUBARCH's. */ |
| 16 | #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT) | 15 | #if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT) |