diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /arch/arm/boot/compressed/head-l7200.S | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/arm/boot/compressed/head-l7200.S')
| -rw-r--r-- | arch/arm/boot/compressed/head-l7200.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head-l7200.S b/arch/arm/boot/compressed/head-l7200.S index b08bd23f8d16..d0e3b20856cd 100644 --- a/arch/arm/boot/compressed/head-l7200.S +++ b/arch/arm/boot/compressed/head-l7200.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * is merged with head.S by the linker. | 7 | * is merged with head.S by the linker. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/config.h> | ||
| 11 | #include <asm/mach-types.h> | 10 | #include <asm/mach-types.h> |
| 12 | 11 | ||
| 13 | #ifndef CONFIG_ARCH_L7200 | 12 | #ifndef CONFIG_ARCH_L7200 |