Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e62112c5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

parents 031cf19e 68905eb4

arch/arm/mach-kirkwood/rd88f6281-setup.c

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/timer.h>

#include <linux/ata_platform.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/pci.h>
@@ -69,6 +70,8 @@ static struct platform_device rd88f6281_nand_flash = { 


static struct mv643xx_eth_platform_data rd88f6281_ge00_data = {

	.phy_addr	= -1,

	.speed		= SPEED_1000,

	.duplex		= DUPLEX_FULL,

};



static struct mv_sata_platform_data rd88f6281_sata_data = {

arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/irq.h>

#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <asm/mach-types.h>

#include <asm/gpio.h>

#include <asm/leds.h>
@@ -88,6 +89,8 @@ static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = { 


static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {

	.phy_addr	= -1,

	.speed		= SPEED_1000,

	.duplex		= DUPLEX_FULL,

};



static void __init rd88f5181l_fxo_init(void)

arch/arm/mach-orion5x/rd88f5181l-ge-setup.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/irq.h>

#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <linux/i2c.h>

#include <asm/mach-types.h>

#include <asm/gpio.h>
@@ -89,6 +90,8 @@ static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = { 


static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {

	.phy_addr	= -1,

	.speed		= SPEED_1000,

	.duplex		= DUPLEX_FULL,

};



static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {

arch/arm/mach-orion5x/wnr854t-setup.c

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/delay.h>

#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <asm/mach-types.h>

#include <asm/gpio.h>

#include <asm/mach/arch.h>
@@ -92,6 +93,8 @@ static struct platform_device wnr854t_nor_flash = { 


static struct mv643xx_eth_platform_data wnr854t_eth_data = {

	.phy_addr	= -1,

	.speed		= SPEED_1000,

	.duplex		= DUPLEX_FULL,

};



static void __init wnr854t_init(void)

arch/arm/mach-orion5x/wrt350n-v2-setup.c

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/delay.h>

#include <linux/mtd/physmap.h>

#include <linux/mv643xx_eth.h>

#include <linux/ethtool.h>

#include <asm/mach-types.h>

#include <asm/gpio.h>

#include <asm/mach/arch.h>
@@ -100,6 +101,8 @@ static struct platform_device wrt350n_v2_nor_flash = { 


static struct mv643xx_eth_platform_data wrt350n_v2_eth_data = {

	.phy_addr	= -1,

	.speed		= SPEED_1000,

	.duplex		= DUPLEX_FULL,

};



static void __init wrt350n_v2_init(void)