X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-2.6.27%2F009-add_integrated_ethernet_mac_support.patch;fp=target%2Flinux%2Fbrcm63xx%2Fpatches-2.6.27%2F009-add_integrated_ethernet_mac_support.patch;h=5c3e0b5c69e8949dbe5d9faa7bd37bafddc96dd3;hb=d8297bb0a4e520c83175a987ff70e4a72f2bd603;hp=9caf6920834821e2618aeb224507dc9c80743fad;hpb=a1b7c85cd4b2c2af1392b26b72893ee164e8d351;p=openwrt.git

diff --git a/target/linux/brcm63xx/patches-2.6.27/009-add_integrated_ethernet_mac_support.patch b/target/linux/brcm63xx/patches-2.6.27/009-add_integrated_ethernet_mac_support.patch
index 9caf692083..5c3e0b5c69 100644
--- a/target/linux/brcm63xx/patches-2.6.27/009-add_integrated_ethernet_mac_support.patch
+++ b/target/linux/brcm63xx/patches-2.6.27/009-add_integrated_ethernet_mac_support.patch
@@ -18,8 +18,6 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
  create mode 100644 drivers/net/bcm63xx_enet.h
  create mode 100644 include/asm-mips/mach-bcm63xx/bcm63xx_dev_enet.h
 
-diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile
-index 99e335d..5358093 100644
 --- a/arch/mips/bcm63xx/Makefile
 +++ b/arch/mips/bcm63xx/Makefile
 @@ -3,4 +3,5 @@ obj-y		+= dev-uart.o
@@ -28,9 +26,6 @@ index 99e335d..5358093 100644
  obj-y		+= dev-usb-ehci.o
 +obj-y		+= dev-enet.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
-diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
-new file mode 100644
-index 0000000..c6e472e
 --- /dev/null
 +++ b/arch/mips/bcm63xx/dev-enet.c
 @@ -0,0 +1,158 @@
@@ -192,11 +187,9 @@ index 0000000..c6e472e
 +		return ret;
 +	return 0;
 +}
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index bbd0e67..01f7e5a 100644
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -1840,6 +1840,15 @@ config NE_H8300
+@@ -1963,6 +1963,15 @@ config NE_H8300
  	  Say Y here if you want to use the NE2000 compatible
  	  controller on the Renesas H8/300 processor.
  
@@ -212,8 +205,6 @@ index bbd0e67..01f7e5a 100644
  source "drivers/net/fs_enet/Kconfig"
  
  endif # NET_ETHERNET
-diff --git a/drivers/net/Makefile b/drivers/net/Makefile
-index 284ed83..ab22f32 100644
 --- a/drivers/net/Makefile
 +++ b/drivers/net/Makefile
 @@ -123,6 +123,7 @@ obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o
@@ -224,9 +215,6 @@ index 284ed83..ab22f32 100644
  obj-$(CONFIG_AX88796) += ax88796.o
  
  obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
-diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
-new file mode 100644
-index 0000000..40c2565
 --- /dev/null
 +++ b/drivers/net/bcm63xx_enet.c
 @@ -0,0 +1,1894 @@
@@ -2124,9 +2112,6 @@ index 0000000..40c2565
 +MODULE_DESCRIPTION("BCM63xx internal ethernet mac driver");
 +MODULE_AUTHOR("Maxime Bizon <mbizon@freebox.fr>");
 +MODULE_LICENSE("GPL");
-diff --git a/drivers/net/bcm63xx_enet.h b/drivers/net/bcm63xx_enet.h
-new file mode 100644
-index 0000000..fe7ffc1
 --- /dev/null
 +++ b/drivers/net/bcm63xx_enet.h
 @@ -0,0 +1,294 @@
@@ -2424,9 +2409,6 @@ index 0000000..fe7ffc1
 +};
 +
 +#endif /* ! BCM63XX_ENET_H_ */
-diff --git a/include/asm-mips/mach-bcm63xx/bcm63xx_dev_enet.h b/include/asm-mips/mach-bcm63xx/bcm63xx_dev_enet.h
-new file mode 100644
-index 0000000..d53f611
 --- /dev/null
 +++ b/include/asm-mips/mach-bcm63xx/bcm63xx_dev_enet.h
 @@ -0,0 +1,45 @@
@@ -2475,6 +2457,3 @@ index 0000000..d53f611
 +				 const struct bcm63xx_enet_platform_data *pd);
 +
 +#endif /* ! BCM63XX_DEV_ENET_H_ */
--- 
-1.5.4.3
-