git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
boot
/
setup.S
diff --git
a/arch/i386/boot/setup.S
b/arch/i386/boot/setup.S
index ca668d9df16411c29d2928d230c32b99a129104f..d2b684cd620ae63888bbb54c06721d0b4fe8e5e5 100644
(file)
--- a/
arch/i386/boot/setup.S
+++ b/
arch/i386/boot/setup.S
@@
-46,9
+46,8
@@
* by Robert Schwebel, December 2001 <robert@schwebel.de>
*/
-#include <linux/config.h>
#include <asm/segment.h>
-#include <linux/
version
.h>
+#include <linux/
utsrelease
.h>
#include <linux/compile.h>
#include <asm/boot.h>
#include <asm/e820.h>