From 763b58c30c60ccc3864e46cf916666766b060f23 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 4 Jun 2011 13:35:55 +0000 Subject: update to 2.6.39.1 patch from Peter Wagner SVN-Revision: 27104 --- .../patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch') diff --git a/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch b/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch index eac20d7e39..94100d0247 100644 --- a/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch +++ b/target/linux/lantiq/patches-2.6.39/0011-MIPS-Lantiq-Add-ethernet-driver.patch @@ -36,7 +36,7 @@ Signed-off-by: Ralf Baechle /* struct used to pass info to the pci core */ enum { -@@ -43,4 +44,10 @@ +@@ -43,4 +44,10 @@ struct ltq_pci_data { int irq[16]; }; @@ -62,7 +62,7 @@ Signed-off-by: Ralf Baechle #define LTQ_DMA_BASE_ADDR 0x1E104100 --- a/arch/mips/lantiq/xway/devices.c +++ b/arch/mips/lantiq/xway/devices.c -@@ -96,3 +96,26 @@ +@@ -96,3 +96,26 @@ void __init ltq_register_ase_asc(void) platform_device_register_simple("ltq_asc", 0, ltq_ase_asc_resources, ARRAY_SIZE(ltq_ase_asc_resources)); } @@ -100,7 +100,7 @@ Signed-off-by: Ralf Baechle #endif --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -2017,6 +2017,13 @@ +@@ -2017,6 +2017,13 @@ config FTMAC100 from Faraday. It is used on Faraday A320, Andes AG101 and some other ARM/NDS32 SoC's. @@ -116,7 +116,7 @@ Signed-off-by: Ralf Baechle source "drivers/net/octeon/Kconfig" --- a/drivers/net/Makefile +++ b/drivers/net/Makefile -@@ -259,6 +259,7 @@ +@@ -259,6 +259,7 @@ obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_GRETH) += greth.o -- cgit v1.2.3