Просмотр исходного кода

brcm63xx: fix up borked patch

Fix up patch borked by quilt fuzzy application of patches.

SVN-Revision: 41294
Jonas Gorski 11 лет назад
Родитель
Сommit
f695fa358a

+ 15 - 1
target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch

@@ -54,14 +54,28 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1621,6 +1633,12 @@ static struct board_info __initdata boar
+@@ -1621,6 +1633,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
 +		.has_phy		= 1,
 +		.phy_id			= 0,
+ 		.force_speed_100	= 1,
+ 		.force_duplex_full	= 1,
+ 	},
+@@ -1642,6 +1656,8 @@ static struct board_info __initdata boar
+ 		.use_internal_phy	= 1,
+ 	},
+ 	.enet1 = {
 +		.has_phy		= 1,
 +		.phy_id			= 0,
+ 		.force_speed_100	= 1,
+ 		.force_duplex_full	= 1,
+ 	},
+@@ -1661,6 +1677,8 @@ static struct board_info __initdata boar
+ 		.use_internal_phy	= 1,
+ 	},
+ 	.enet1 = {
 +		.has_phy		= 1,
 +		.phy_id			= 0,
  		.force_speed_100	= 1,

+ 15 - 1
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch

@@ -54,14 +54,28 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -1623,6 +1635,12 @@ static struct board_info __initdata boar
+@@ -1623,6 +1635,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
 +		.has_phy		= 1,
 +		.phy_id			= 0,
+ 		.force_speed_100	= 1,
+ 		.force_duplex_full	= 1,
+ 	},
+@@ -1644,6 +1658,8 @@ static struct board_info __initdata boar
+ 		.use_internal_phy	= 1,
+ 	},
+ 	.enet1 = {
 +		.has_phy		= 1,
 +		.phy_id			= 0,
+ 		.force_speed_100	= 1,
+ 		.force_duplex_full	= 1,
+ 	},
+@@ -1663,6 +1679,8 @@ static struct board_info __initdata boar
+ 		.use_internal_phy	= 1,
+ 	},
+ 	.enet1 = {
 +		.has_phy		= 1,
 +		.phy_id			= 0,
  		.force_speed_100	= 1,