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 tag 'arc-v3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
plat-orion
/
common.c
diff --git
a/arch/arm/plat-orion/common.c
b/arch/arm/plat-orion/common.c
index 251f827271e918adf62b378d59aef9e7272d8b70..c019b7aaf776b7d622aa5c97146070aee57ef523 100644
(file)
--- a/
arch/arm/plat-orion/common.c
+++ b/
arch/arm/plat-orion/common.c
@@
-383,7
+383,7
@@
static struct resource orion_ge10_shared_resources[] = {
static struct platform_device orion_ge10_shared = {
.name = MV643XX_ETH_SHARED_NAME,
static struct platform_device orion_ge10_shared = {
.name = MV643XX_ETH_SHARED_NAME,
- .id =
1
,
+ .id =
2
,
.dev = {
.platform_data = &orion_ge10_shared_data,
},
.dev = {
.platform_data = &orion_ge10_shared_data,
},
@@
-398,8
+398,8
@@
static struct resource orion_ge10_resources[] = {
static struct platform_device orion_ge10 = {
.name = MV643XX_ETH_NAME,
static struct platform_device orion_ge10 = {
.name = MV643XX_ETH_NAME,
- .id =
1
,
- .num_resources =
2
,
+ .id =
2
,
+ .num_resources =
1
,
.resource = orion_ge10_resources,
.dev = {
.coherent_dma_mask = DMA_BIT_MASK(32),
.resource = orion_ge10_resources,
.dev = {
.coherent_dma_mask = DMA_BIT_MASK(32),
@@
-432,7
+432,7
@@
static struct resource orion_ge11_shared_resources[] = {
static struct platform_device orion_ge11_shared = {
.name = MV643XX_ETH_SHARED_NAME,
static struct platform_device orion_ge11_shared = {
.name = MV643XX_ETH_SHARED_NAME,
- .id =
1
,
+ .id =
3
,
.dev = {
.platform_data = &orion_ge11_shared_data,
},
.dev = {
.platform_data = &orion_ge11_shared_data,
},
@@
-447,8
+447,8
@@
static struct resource orion_ge11_resources[] = {
static struct platform_device orion_ge11 = {
.name = MV643XX_ETH_NAME,
static struct platform_device orion_ge11 = {
.name = MV643XX_ETH_NAME,
- .id =
1
,
- .num_resources =
2
,
+ .id =
3
,
+ .num_resources =
1
,
.resource = orion_ge11_resources,
.dev = {
.coherent_dma_mask = DMA_BIT_MASK(32),
.resource = orion_ge11_resources,
.dev = {
.coherent_dma_mask = DMA_BIT_MASK(32),