summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-30 10:59:03 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-30 10:59:03 +0000
commitd445fbb21a5b85a127ca0ac49160e3ed0ab9c6a3 (patch)
tree34d8aa29337e3b594b9617baeaf2db84e77bb1e0 /target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
parent8031de837402892f116145e115fb5abb13f2d1c5 (diff)
sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10988 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
index 4259ff971..2ab59ff06 100644
--- a/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/151-lanready_ap1000_mac_plat_info.patch
@@ -1,14 +1,15 @@
diff -Nur linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c
--- linux-2.6.23.1/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:11:10.000000000 +0100
+++ linux-2.6.23.1-owrt/arch/arm/mach-ixp4xx/ap1000-setup.c 2007-11-14 14:09:30.000000000 +0100
-@@ -90,9 +90,36 @@
+@@ -90,9 +90,37 @@
.resource = ap1000_uart_resources
};
+/* Built-in 10/100 Ethernet MAC interfaces */
+static struct eth_plat_info ap1000_plat_eth[] = {
+ {
-+ .phy = 4,
++ .phy = IXP4XX_ETH_PHY_MAX_ADDR,
++ .phy_mask = 0x1e,
+ .rxq = 3,
+ .txreadyq = 20,
+ }, {