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/i386/boot/setup.S | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'arch/i386/boot/setup.S')
| -rw-r--r-- | arch/i386/boot/setup.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S index ca668d9df164..0a5a3be6d69c 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | * by Robert Schwebel, December 2001 <robert@schwebel.de> | 46 | * by Robert Schwebel, December 2001 <robert@schwebel.de> |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/config.h> | ||
| 50 | #include <asm/segment.h> | 49 | #include <asm/segment.h> |
| 51 | #include <linux/version.h> | 50 | #include <linux/version.h> |
| 52 | #include <linux/compile.h> | 51 | #include <linux/compile.h> |