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 'samsung_platform_data' into staging/for_v3.7
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-ux500
/
board-mop500.c
diff --git
a/arch/arm/mach-ux500/board-mop500.c
b/arch/arm/mach-ux500/board-mop500.c
index a534d8880de12e2a92b0c7a35ec1ebdc3034c44e..c243e45fad68c9262a0299e348f209d837822870 100644
(file)
--- a/
arch/arm/mach-ux500/board-mop500.c
+++ b/
arch/arm/mach-ux500/board-mop500.c
@@
-48,7
+48,7
@@
#include <mach/setup.h>
#include <mach/devices.h>
#include <mach/irqs.h>
-#include <
mach
/crypto-ux500.h>
+#include <
linux/platform_data
/crypto-ux500.h>
#include "ste-dma40-db8500.h"
#include "devices-db8500.h"