projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git]
/
arch
/
arm
/
mach-shmobile
/
board-armadillo800eva.c
diff --git
a/arch/arm/mach-shmobile/board-armadillo800eva.c
b/arch/arm/mach-shmobile/board-armadillo800eva.c
index
45221fd
..
e115f67
100644
(file)
--- a/
arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/
arch/arm/mach-shmobile/board-armadillo800eva.c
@@
-378,7
+378,7
@@
static struct resource sh_eth_resources[] = {
};
static struct platform_device sh_eth_device = {
- .name = "
sh-eth
",
+ .name = "
r8a7740-gether
",
.id = -1,
.dev = {
.platform_data = &sh_eth_platdata,