git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'origin/master'
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
board-msm7x30.c
diff --git
a/arch/arm/mach-msm/board-msm7x30.c
b/arch/arm/mach-msm/board-msm7x30.c
index
bac1f3c
..
e329819
100644
(file)
--- a/
arch/arm/mach-msm/board-msm7x30.c
+++ b/
arch/arm/mach-msm/board-msm7x30.c
@@
-20,7
+20,6
@@
#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
-#include <linux/bootmem.h>
#include <linux/io.h>
#include <linux/smsc911x.h>