projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap1
/
board-nokia770.c
diff --git
a/arch/arm/mach-omap1/board-nokia770.c
b/arch/arm/mach-omap1/board-nokia770.c
index c54b45f32638bf02f2c57f72fcbc573682be403f..2c0ca8fc3380092380b6e2e683dfa9a17460fadf 100644
(file)
--- a/
arch/arm/mach-omap1/board-nokia770.c
+++ b/
arch/arm/mach-omap1/board-nokia770.c
@@
-26,7
+26,6
@@
#include <asm/mach/map.h>
#include <plat/mux.h>
-#include <plat/usb.h>
#include <plat/board.h>
#include <plat/keypad.h>
#include <plat/lcd_mipid.h>
@@
-34,6
+33,7
@@
#include <plat/clock.h>
#include <mach/hardware.h>
+#include <mach/usb.h>
#include "common.h"