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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
arch
/
i386
/
mach-voyager
/
voyager_thread.c
diff --git
a/arch/i386/mach-voyager/voyager_thread.c
b/arch/i386/mach-voyager/voyager_thread.c
index 2b03884fdb2a968a904ca08f29c9f8c017e22788..50f6de6ff64dadd20988cf1de715ffb9c76eb863 100644
(file)
--- a/
arch/i386/mach-voyager/voyager_thread.c
+++ b/
arch/i386/mach-voyager/voyager_thread.c
@@
-14,7
+14,6
@@
* */
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/kernel_stat.h>
#include <linux/delay.h>