diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 01:16:02 -0500 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/cris/kernel/vmlinux.lds.S | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/cris/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/cris/kernel/vmlinux.lds.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S index bbfda67d2907..d49d17d2a14f 100644 --- a/arch/cris/kernel/vmlinux.lds.S +++ b/arch/cris/kernel/vmlinux.lds.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * the kernel has booted. | 8 | * the kernel has booted. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/autoconf.h> | ||
| 12 | #include <asm-generic/vmlinux.lds.h> | 11 | #include <asm-generic/vmlinux.lds.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | 13 | ||