diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/um/kernel/vmlinux.lds.S | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/um/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/um/kernel/vmlinux.lds.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S index 72acdce205e0..f8aeb448aab6 100644 --- a/arch/um/kernel/vmlinux.lds.S +++ b/arch/um/kernel/vmlinux.lds.S | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | /* in case the preprocessor is a 32bit one */ | ||
| 2 | #undef i386 | ||
| 3 | #ifdef CONFIG_LD_SCRIPT_STATIC | 1 | #ifdef CONFIG_LD_SCRIPT_STATIC |
| 4 | #include "uml.lds.S" | 2 | #include "uml.lds.S" |
| 5 | #else | 3 | #else |