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 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
cadence
/
at91_ether.c
diff --git
a/drivers/net/ethernet/cadence/at91_ether.c
b/drivers/net/ethernet/cadence/at91_ether.c
index 1b0ba8c819f7147f183d667932e9f81dc67b3f51..56624d3034871c4988ddd3e4963206133eaab517 100644
(file)
--- a/
drivers/net/ethernet/cadence/at91_ether.c
+++ b/
drivers/net/ethernet/cadence/at91_ether.c
@@
-35,7
+35,7
@@
#include <asm/mach-types.h>
#include <mach/at91rm9200_emac.h>
-#include <
mach
/gpio.h>
+#include <
asm
/gpio.h>
#include <mach/board.h>
#include "at91_ether.h"