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

Commit 9a5467fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
  tcp: MD5: Fix IPv6 signatures
  skbuff: add missing kernel-doc for do_not_encrypt
  net/ipv4/route.c: fix build error
  tcp: MD5: Fix MD5 signatures on certain ACK packets
  ipv6: Fix ip6_xmit to send fragments if ipfragok is true
  ipvs: Move userspace definitions to include/linux/ip_vs.h
  netdev: Fix lockdep warnings in multiqueue configurations.
  netfilter: xt_hashlimit: fix race between htable_destroy and htable_gc
  netfilter: ipt_recent: fix race between recent_mt_destroy and proc manipulations
  netfilter: nf_conntrack_tcp: decrease timeouts while data in unacknowledged
  irda: replace __FUNCTION__ with __func__
  nsc-ircc: default to dongle type 9 on IBM hardware
  bluetooth: add quirks for a few hci_usb devices
  hysdn: remove the packed attribute from PofTimStamp_tag
  isdn: use the common ascii hex helpers
  tg3: adapt tg3 to use reworked PCI PM code
  atm: fix direct casts of pointers to u32 in the InterPhase driver
  atm: fix const assignment/discard warnings in the ATM networking driver
  net: use the common ascii hex helpers
  random32: seeding improvement
  ...
parents 67605613 00b1304c

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)