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 tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
[sfrench/cifs-2.6.git]
/
arch
/
c6x
/
kernel
/
setup.c
diff --git
a/arch/c6x/kernel/setup.c
b/arch/c6x/kernel/setup.c
index 2cfca640acfee37c5b1f1ec3a3b8607197e137ae..e9d6824ae94d51201a9aea3c4200318a206bff2d 100644
(file)
--- a/
arch/c6x/kernel/setup.c
+++ b/
arch/c6x/kernel/setup.c
@@
-11,7
+11,6
@@
#include <linux/dma-mapping.h>
#include <linux/memblock.h>
#include <linux/seq_file.h>
-#include <linux/bootmem.h>
#include <linux/clkdev.h>
#include <linux/initrd.h>
#include <linux/kernel.h>