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 'depends/rmk/gpio' into next/devel
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-at91
/
at91sam9g45_devices.c
diff --git
a/arch/arm/mach-at91/at91sam9g45_devices.c
b/arch/arm/mach-at91/at91sam9g45_devices.c
index e4a98574893dc6160dde97b485ed23d01a627a17..b1e43ad2ccf76f8f6f344cb89c15811e1966ca56 100644
(file)
--- a/
arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/
arch/arm/mach-at91/at91sam9g45_devices.c
@@
-13,6
+13,7
@@
#include <asm/mach/map.h>
#include <linux/dma-mapping.h>
#include <asm/mach/map.h>
#include <linux/dma-mapping.h>
+#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <linux/i2c-gpio.h>
#include <linux/atmel-mci.h>
#include <linux/platform_device.h>
#include <linux/i2c-gpio.h>
#include <linux/atmel-mci.h>
@@
-21,7
+22,6
@@
#include <video/atmel_lcdc.h>
#include <mach/board.h>
#include <video/atmel_lcdc.h>
#include <mach/board.h>
-#include <mach/gpio.h>
#include <mach/at91sam9g45.h>
#include <mach/at91sam9g45_matrix.h>
#include <mach/at91sam9_smc.h>
#include <mach/at91sam9g45.h>
#include <mach/at91sam9g45_matrix.h>
#include <mach/at91sam9_smc.h>