aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.24
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-05-19 07:06:35 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-05-19 07:06:35 +0000
commitb0b3bc5f009249df74c13ec0dc6087cf1943b318 (patch)
tree04584132f5c79a71a972bf9597a9c1d3085f9bbb /target/linux/ar7/patches-2.6.24
parentd132c5f42c208e4ab1bb3be0a7503262ee7e4059 (diff)
downloadupstream-b0b3bc5f009249df74c13ec0dc6087cf1943b318.tar.gz
upstream-b0b3bc5f009249df74c13ec0dc6087cf1943b318.tar.bz2
upstream-b0b3bc5f009249df74c13ec0dc6087cf1943b318.zip
refresh kernel patches
SVN-Revision: 11196
Diffstat (limited to 'target/linux/ar7/patches-2.6.24')
-rw-r--r--target/linux/ar7/patches-2.6.24/100-board_support.patch32
-rw-r--r--target/linux/ar7/patches-2.6.24/110-flash.patch24
-rw-r--r--target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch16
-rw-r--r--target/linux/ar7/patches-2.6.24/130-vlynq.patch17
-rw-r--r--target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch28
-rw-r--r--target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff29
-rw-r--r--target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff18
-rw-r--r--target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch9
-rw-r--r--target/linux/ar7/patches-2.6.24/500-serial_kludge.patch16
-rw-r--r--target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff10
10 files changed, 102 insertions, 97 deletions
diff --git a/target/linux/ar7/patches-2.6.24/100-board_support.patch b/target/linux/ar7/patches-2.6.24/100-board_support.patch
index b9ee68737f..744371eec5 100644
--- a/target/linux/ar7/patches-2.6.24/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.24/100-board_support.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/arch/mips/Kconfig
+Index: linux-2.6.24.7/arch/mips/Kconfig
===================================================================
---- linux-2.6.23-rc6.orig/arch/mips/Kconfig 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/Kconfig 2007-09-21 16:24:11.000000000 +0800
-@@ -15,6 +15,24 @@
+--- linux-2.6.24.7.orig/arch/mips/Kconfig
++++ linux-2.6.24.7/arch/mips/Kconfig
+@@ -16,6 +16,24 @@ choice
prompt "System type"
default SGI_IP22
@@ -27,11 +27,11 @@ Index: linux-2.6.23-rc6/arch/mips/Kconfig
config MACH_ALCHEMY
bool "Alchemy processor based machines"
-Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
+Index: linux-2.6.24.7/arch/mips/kernel/traps.c
===================================================================
---- linux-2.6.23-rc6.orig/arch/mips/kernel/traps.c 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/kernel/traps.c 2007-09-21 16:24:11.000000000 +0800
-@@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *addr)
+--- linux-2.6.24.7.orig/arch/mips/kernel/traps.c
++++ linux-2.6.24.7/arch/mips/kernel/traps.c
+@@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *add
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
@@ -57,11 +57,11 @@ Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
}
return (void *)old_handler;
}
-Index: linux-2.6.23-rc6/arch/mips/Makefile
+Index: linux-2.6.24.7/arch/mips/Makefile
===================================================================
---- linux-2.6.23-rc6.orig/arch/mips/Makefile 2007-09-21 16:24:05.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/Makefile 2007-09-21 16:24:11.000000000 +0800
-@@ -161,6 +161,13 @@
+--- linux-2.6.24.7.orig/arch/mips/Makefile
++++ linux-2.6.24.7/arch/mips/Makefile
+@@ -159,6 +159,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
#
#
@@ -75,11 +75,11 @@ Index: linux-2.6.23-rc6/arch/mips/Makefile
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
#
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
-Index: linux-2.6.23-rc6/include/asm-mips/page.h
+Index: linux-2.6.24.7/include/asm-mips/page.h
===================================================================
---- linux-2.6.23-rc6.orig/include/asm-mips/page.h 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/include/asm-mips/page.h 2007-09-21 16:24:11.000000000 +0800
-@@ -184,8 +184,10 @@
+--- linux-2.6.24.7.orig/include/asm-mips/page.h
++++ linux-2.6.24.7/include/asm-mips/page.h
+@@ -184,8 +184,10 @@ typedef struct { unsigned long pgprot; }
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
diff --git a/target/linux/ar7/patches-2.6.24/110-flash.patch b/target/linux/ar7/patches-2.6.24/110-flash.patch
index 4f6a3c2879..7a313681d9 100644
--- a/target/linux/ar7/patches-2.6.24/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.24/110-flash.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
+Index: linux-2.6.24.7/drivers/mtd/Kconfig
===================================================================
---- linux-2.6.23-rc6.orig/drivers/mtd/Kconfig 2007-09-21 16:23:59.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/Kconfig 2007-09-21 16:24:11.000000000 +0800
-@@ -160,6 +160,12 @@
+--- linux-2.6.24.7.orig/drivers/mtd/Kconfig
++++ linux-2.6.24.7/drivers/mtd/Kconfig
+@@ -160,6 +160,12 @@ config MTD_AFS_PARTS
for your particular device. It won't happen automatically. The
'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
@@ -15,11 +15,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
comment "User Modules And Translation Layers"
config MTD_CHAR
-Index: linux-2.6.23-rc6/drivers/mtd/Makefile
+Index: linux-2.6.24.7/drivers/mtd/Makefile
===================================================================
---- linux-2.6.23-rc6.orig/drivers/mtd/Makefile 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/Makefile 2007-09-21 16:24:11.000000000 +0800
-@@ -11,6 +11,7 @@
+--- linux-2.6.24.7.orig/drivers/mtd/Makefile
++++ linux-2.6.24.7/drivers/mtd/Makefile
+@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
@@ -27,11 +27,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/Makefile
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
-Index: linux-2.6.23-rc6/drivers/mtd/maps/physmap.c
+Index: linux-2.6.24.7/drivers/mtd/maps/physmap.c
===================================================================
---- linux-2.6.23-rc6.orig/drivers/mtd/maps/physmap.c 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/maps/physmap.c 2007-09-21 16:24:11.000000000 +0800
-@@ -74,7 +74,8 @@
+--- linux-2.6.24.7.orig/drivers/mtd/maps/physmap.c
++++ linux-2.6.24.7/drivers/mtd/maps/physmap.c
+@@ -74,7 +74,8 @@ static int physmap_flash_remove(struct p
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS
diff --git a/target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch
index 53fd7796a1..27db92ac84 100644
--- a/target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch
+++ b/target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc6/drivers/char/Kconfig
+Index: linux-2.6.24.7/drivers/char/Kconfig
===================================================================
---- linux-2.6.23-rc6.orig/drivers/char/Kconfig 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/char/Kconfig 2007-09-21 16:24:12.000000000 +0800
-@@ -928,6 +928,15 @@
+--- linux-2.6.24.7.orig/drivers/char/Kconfig
++++ linux-2.6.24.7/drivers/char/Kconfig
+@@ -904,6 +904,15 @@ config MWAVE
To compile this driver as a module, choose M here: the
module will be called mwave.
@@ -18,11 +18,11 @@ Index: linux-2.6.23-rc6/drivers/char/Kconfig
config SCx200_GPIO
tristate "NatSemi SCx200 GPIO Support"
depends on SCx200
-Index: linux-2.6.23-rc6/drivers/char/Makefile
+Index: linux-2.6.24.7/drivers/char/Makefile
===================================================================
---- linux-2.6.23-rc6.orig/drivers/char/Makefile 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/char/Makefile 2007-09-21 16:24:12.000000000 +0800
-@@ -89,6 +89,7 @@
+--- linux-2.6.24.7.orig/drivers/char/Makefile
++++ linux-2.6.24.7/drivers/char/Makefile
+@@ -89,6 +89,7 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
diff --git a/target/linux/ar7/patches-2.6.24/130-vlynq.patch b/target/linux/ar7/patches-2.6.24/130-vlynq.patch
index df460fc136..f4154ab8eb 100644
--- a/target/linux/ar7/patches-2.6.24/130-vlynq.patch
+++ b/target/linux/ar7/patches-2.6.24/130-vlynq.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23-rc9/drivers/Kconfig
+Index: linux-2.6.24.7/drivers/Kconfig
===================================================================
---- linux-2.6.23-rc9.orig/drivers/Kconfig 2007-10-05 20:47:14.000000000 +0800
-+++ linux-2.6.23-rc9/drivers/Kconfig 2007-10-05 20:47:42.000000000 +0800
-@@ -94,5 +94,7 @@ source "drivers/kvm/Kconfig"
+--- linux-2.6.24.7.orig/drivers/Kconfig
++++ linux-2.6.24.7/drivers/Kconfig
+@@ -96,5 +96,7 @@ source "drivers/kvm/Kconfig"
source "drivers/uio/Kconfig"
@@ -10,14 +10,15 @@ Index: linux-2.6.23-rc9/drivers/Kconfig
+
source "drivers/virtio/Kconfig"
endmenu
-Index: linux-2.6.23-rc9/drivers/Makefile
+Index: linux-2.6.24.7/drivers/Makefile
===================================================================
---- linux-2.6.23-rc9.orig/drivers/Makefile 2007-10-05 20:47:09.000000000 +0800
-+++ linux-2.6.23-rc9/drivers/Makefile 2007-10-05 20:47:30.000000000 +0800
-@@ -89,5 +89,6 @@ obj-$(CONFIG_DCA) += dca/
+--- linux-2.6.24.7.orig/drivers/Makefile
++++ linux-2.6.24.7/drivers/Makefile
+@@ -89,6 +89,7 @@ obj-$(CONFIG_DCA) += dca/
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/
+obj-$(CONFIG_VLYNQ) += vlynq/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
+ obj-$(CONFIG_GPIO_DEVICE) += gpio/
diff --git a/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch b/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
index 020197a1b7..7658932950 100644
--- a/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
+++ b/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
@@ -1,5 +1,7 @@
---- linux-2.6.24/drivers/net/cpmac.c 2008-01-25 02:20:37.000000000 +0100
-+++ linux-2.6.24/drivers/net/cpmac.c 2008-04-06 21:30:03.000000000 +0200
+Index: linux-2.6.24.7/drivers/net/cpmac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/cpmac.c
++++ linux-2.6.24.7/drivers/net/cpmac.c
@@ -38,6 +38,7 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
@@ -8,7 +10,7 @@
MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");
MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
-@@ -207,6 +208,7 @@
+@@ -207,6 +208,7 @@ struct cpmac_priv {
struct work_struct reset_work;
struct platform_device *pdev;
struct napi_struct napi;
@@ -16,7 +18,7 @@
};
static irqreturn_t cpmac_irq(int, void *);
-@@ -455,6 +457,9 @@
+@@ -455,6 +457,9 @@ static int cpmac_start_xmit(struct sk_bu
struct cpmac_desc *desc;
struct cpmac_priv *priv = netdev_priv(dev);
@@ -26,7 +28,7 @@
if (unlikely(skb_padto(skb, ETH_ZLEN)))
return NETDEV_TX_OK;
-@@ -634,14 +639,14 @@
+@@ -634,14 +639,14 @@ static void cpmac_clear_tx(struct net_de
priv->desc_ring[i].dataflags = 0;
if (priv->desc_ring[i].skb) {
dev_kfree_skb_any(priv->desc_ring[i].skb);
@@ -43,7 +45,7 @@
struct cpmac_priv *priv =
container_of(work, struct cpmac_priv, reset_work);
-@@ -650,8 +655,47 @@
+@@ -650,8 +655,47 @@ static void cpmac_hw_error(struct work_s
spin_unlock(&priv->rx_lock);
cpmac_clear_tx(priv->dev);
cpmac_hw_start(priv->dev);
@@ -93,7 +95,7 @@
}
static irqreturn_t cpmac_irq(int irq, void *dev_id)
-@@ -661,9 +705,6 @@
+@@ -661,9 +705,6 @@ static irqreturn_t cpmac_irq(int irq, vo
int queue;
u32 status;
@@ -103,7 +105,7 @@
priv = netdev_priv(dev);
status = cpmac_read(priv->regs, CPMAC_MAC_INT_VECTOR);
-@@ -685,49 +726,33 @@
+@@ -685,49 +726,33 @@ static irqreturn_t cpmac_irq(int irq, vo
cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0);
@@ -167,7 +169,7 @@
}
static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-@@ -848,15 +873,6 @@
+@@ -848,15 +873,6 @@ static void cpmac_adjust_link(struct net
spin_unlock(&priv->lock);
}
@@ -183,7 +185,7 @@
static int cpmac_open(struct net_device *dev)
{
int i, size, res;
-@@ -923,6 +939,7 @@
+@@ -923,6 +939,7 @@ static int cpmac_open(struct net_device
goto fail_irq;
}
@@ -191,7 +193,7 @@
INIT_WORK(&priv->reset_work, cpmac_hw_error);
cpmac_hw_start(dev);
-@@ -999,11 +1016,11 @@
+@@ -999,11 +1016,11 @@ static int external_switch;
static int __devinit cpmac_probe(struct platform_device *pdev)
{
int rc, phy_id, i;
@@ -204,7 +206,7 @@
DECLARE_MAC_BUF(mac);
pdata = pdev->dev.platform_data;
-@@ -1017,9 +1034,23 @@
+@@ -1017,9 +1034,23 @@ static int __devinit cpmac_probe(struct
}
if (phy_id == PHY_MAX_ADDR) {
@@ -230,7 +232,7 @@
printk(KERN_ERR "cpmac: no PHY present\n");
return -ENODEV;
}
-@@ -1063,32 +1094,8 @@
+@@ -1063,32 +1094,8 @@ static int __devinit cpmac_probe(struct
priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
diff --git a/target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff b/target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff
index 05a578b2f0..c2fb478c4d 100644
--- a/target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff
+++ b/target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff
@@ -13,11 +13,11 @@ Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
drivers/net/cpmac.c | 19 +++----------------
2 files changed, 20 insertions(+), 16 deletions(-)
-diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
-index 22c79f5..02bd574 100644
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -32,6 +32,8 @@
+Index: linux-2.6.24.7/arch/mips/ar7/platform.c
+===================================================================
+--- linux-2.6.24.7.orig/arch/mips/ar7/platform.c
++++ linux-2.6.24.7/arch/mips/ar7/platform.c
+@@ -33,6 +33,8 @@
#include <linux/vlynq.h>
#include <linux/leds.h>
#include <linux/string.h>
@@ -26,7 +26,7 @@ index 22c79f5..02bd574 100644
#include <asm/addrspace.h>
#include <asm/ar7/ar7.h>
-@@ -204,6 +206,13 @@ static struct physmap_flash_data physmap_flash_data = {
+@@ -205,6 +207,13 @@ static struct physmap_flash_data physmap
.width = 2,
};
@@ -40,7 +40,7 @@ index 22c79f5..02bd574 100644
static struct plat_cpmac_data cpmac_low_data = {
.reset_bit = 17,
.power_bit = 20,
-@@ -505,6 +514,10 @@ static int __init ar7_register_devices(void)
+@@ -506,6 +515,10 @@ static int __init ar7_register_devices(v
}
if (ar7_has_high_cpmac()) {
@@ -51,7 +51,7 @@ index 22c79f5..02bd574 100644
cpmac_get_mac(1, cpmac_high_data.dev_addr);
res = platform_device_register(&cpmac_high);
if (res)
-@@ -513,6 +526,10 @@ static int __init ar7_register_devices(void)
+@@ -514,6 +527,10 @@ static int __init ar7_register_devices(v
cpmac_low_data.phy_mask = 0xffffffff;
}
@@ -62,11 +62,11 @@ index 22c79f5..02bd574 100644
cpmac_get_mac(0, cpmac_low_data.dev_addr);
res = platform_device_register(&cpmac_low);
if (res)
-diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
-index ac5a8c4..dbac01d 100644
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -1034,23 +1034,10 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
+Index: linux-2.6.24.7/drivers/net/cpmac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/cpmac.c
++++ linux-2.6.24.7/drivers/net/cpmac.c
+@@ -1035,23 +1035,10 @@ static int __devinit cpmac_probe(struct
if (phy_id == PHY_MAX_ADDR) {
if (external_switch || dumb_switch) {
@@ -93,6 +93,3 @@ index ac5a8c4..dbac01d 100644
return -ENODEV;
}
}
---
-1.5.2.2
-
diff --git a/target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff b/target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff
index 47f7e6c989..2fb71cd4b6 100644
--- a/target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff
+++ b/target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff
@@ -1,6 +1,8 @@
---- linux-2.6.24.3/drivers/net/cpmac.c.orig 2008-03-10 23:59:56.000000000 +0000
-+++ linux-2.6.24.3/drivers/net/cpmac.c 2008-03-11 00:13:04.000000000 +0000
-@@ -187,6 +187,7 @@
+Index: linux-2.6.24.7/drivers/net/cpmac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/cpmac.c
++++ linux-2.6.24.7/drivers/net/cpmac.c
+@@ -187,6 +187,7 @@ struct cpmac_desc {
#define CPMAC_EOQ 0x1000
struct sk_buff *skb;
struct cpmac_desc *next;
@@ -8,7 +10,7 @@
dma_addr_t mapping;
dma_addr_t data_mapping;
};
-@@ -242,6 +243,16 @@
+@@ -242,6 +243,16 @@ static void cpmac_dump_desc(struct net_d
printk("\n");
}
@@ -25,7 +27,7 @@
static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
{
int i;
-@@ -413,21 +424,40 @@
+@@ -413,21 +424,40 @@ static struct sk_buff *cpmac_rx_one(stru
static int cpmac_poll(struct napi_struct *napi, int budget)
{
struct sk_buff *skb;
@@ -68,7 +70,7 @@
skb = cpmac_rx_one(priv, desc);
if (likely(skb)) {
netif_receive_skb(skb);
-@@ -436,19 +466,81 @@
+@@ -436,19 +466,81 @@ static int cpmac_poll(struct napi_struct
desc = desc->next;
}
@@ -152,7 +154,7 @@
}
static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
-@@ -625,8 +717,10 @@
+@@ -625,8 +717,10 @@ static void cpmac_clear_rx(struct net_de
desc->dataflags = CPMAC_OWN;
dev->stats.rx_dropped++;
}
@@ -163,7 +165,7 @@
}
static void cpmac_clear_tx(struct net_device *dev)
-@@ -927,9 +1021,12 @@
+@@ -928,9 +1022,12 @@ static int cpmac_open(struct net_device
desc->buflen = CPMAC_SKB_SIZE;
desc->dataflags = CPMAC_OWN;
desc->next = &priv->rx_head[(i + 1) % priv->ring_size];
diff --git a/target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch b/target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch
index b2af2544bb..bebd453cc1 100644
--- a/target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch
+++ b/target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch
@@ -1,7 +1,8 @@
-diff -pruN linux-2.6.24.2.old/drivers/net/cpmac.c linux-2.6.24.2/drivers/net/cpmac.c
---- linux-2.6.24.2.old/drivers/net/cpmac.c 2008-03-20 20:33:01.000000000 +0100
-+++ linux-2.6.24.2/drivers/net/cpmac.c 2008-03-20 20:47:31.000000000 +0100
-@@ -1178,9 +1179,7 @@ static int __devinit cpmac_probe(struct
+Index: linux-2.6.24.7/drivers/net/cpmac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/cpmac.c
++++ linux-2.6.24.7/drivers/net/cpmac.c
+@@ -1178,9 +1178,7 @@ static int __devinit cpmac_probe(struct
priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
diff --git a/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
index edb2b5e9f6..a66bc8ad8d 100644
--- a/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.24/drivers/serial/8250.c
+Index: linux-2.6.24.7/drivers/serial/8250.c
===================================================================
---- linux-2.6.24/drivers/serial/8250.c 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.24/drivers/serial/8250.c 2007-09-21 16:24:14.000000000 +0800
-@@ -267,6 +267,13 @@
+--- linux-2.6.24.7.orig/drivers/serial/8250.c
++++ linux-2.6.24.7/drivers/serial/8250.c
+@@ -267,6 +267,13 @@ static const struct serial8250_config ua
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO,
},
@@ -16,7 +16,7 @@ Index: linux-2.6.24/drivers/serial/8250.c
};
#if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2453,7 +2460,11 @@
+@@ -2453,7 +2460,11 @@ static void serial8250_console_putchar(s
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
@@ -28,10 +28,10 @@ Index: linux-2.6.24/drivers/serial/8250.c
serial_out(up, UART_TX, ch);
}
-Index: linux-2.6.24/include/linux/serial_core.h
+Index: linux-2.6.24.7/include/linux/serial_core.h
===================================================================
---- linux-2.6.24/include/linux/serial_core.h 2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.24/include/linux/serial_core.h 2007-09-21 16:24:14.000000000 +0800
+--- linux-2.6.24.7.orig/include/linux/serial_core.h
++++ linux-2.6.24.7/include/linux/serial_core.h
@@ -40,7 +40,8 @@
#define PORT_NS16550A 14
#define PORT_XSCALE 15
diff --git a/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
index 0a2224f683..dfd1a67479 100644
--- a/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
@@ -1,6 +1,8 @@
---- linux-2.6.24.2/drivers/net/cpmac.c 2008-03-10 22:13:50.000000000 +0100
-+++ linux-2.6.24.2/drivers/net/cpmac.c 2008-03-05 15:13:27.000000000 +0100
-@@ -841,7 +841,8 @@
+Index: linux-2.6.24.7/drivers/net/cpmac.c
+===================================================================
+--- linux-2.6.24.7.orig/drivers/net/cpmac.c
++++ linux-2.6.24.7/drivers/net/cpmac.c
+@@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
int new_state = 0;
spin_lock(&priv->lock);
@@ -10,7 +12,7 @@
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -853,11 +854,11 @@
+@@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
priv->oldspeed = priv->phy->speed;
}