aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.26
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-09-26 18:46:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-09-26 18:46:53 +0000
commit821170133fc75f42c73b4d11761d798eae7e4733 (patch)
tree46681f18f733797b93dcddf710bc8d1ab9c4a079 /target/linux/ar7/patches-2.6.26
parent6f98e7cf01458f9deca4c99e47ad4578efcaf04e (diff)
downloadupstream-821170133fc75f42c73b4d11761d798eae7e4733.tar.gz
upstream-821170133fc75f42c73b4d11761d798eae7e4733.tar.bz2
upstream-821170133fc75f42c73b4d11761d798eae7e4733.zip
update to 2.6.26.5 and 2.6.25.17
SVN-Revision: 12718
Diffstat (limited to 'target/linux/ar7/patches-2.6.26')
-rw-r--r--target/linux/ar7/patches-2.6.26/100-board_support.patch2
-rw-r--r--target/linux/ar7/patches-2.6.26/110-flash.patch15
-rw-r--r--target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch4
-rw-r--r--target/linux/ar7/patches-2.6.26/130-vlynq.patch12
-rw-r--r--target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch2
-rw-r--r--target/linux/ar7/patches-2.6.26/500-serial_kludge.patch4
-rw-r--r--target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch4
-rw-r--r--target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff4
8 files changed, 20 insertions, 27 deletions
diff --git a/target/linux/ar7/patches-2.6.26/100-board_support.patch b/target/linux/ar7/patches-2.6.26/100-board_support.patch
index 33b0b8baaf..82d09b0f01 100644
--- a/target/linux/ar7/patches-2.6.26/100-board_support.patch
+++ b/target/linux/ar7/patches-2.6.26/100-board_support.patch
@@ -26,7 +26,7 @@
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
-@@ -1112,9 +1112,22 @@
+@@ -1188,9 +1188,22 @@
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
diff --git a/target/linux/ar7/patches-2.6.26/110-flash.patch b/target/linux/ar7/patches-2.6.26/110-flash.patch
index 39bf83affc..4740e3421e 100644
--- a/target/linux/ar7/patches-2.6.26/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.26/110-flash.patch
@@ -1,6 +1,5 @@
-diff -ruN linux-2.6.26.3.orig/drivers/mtd/Kconfig linux-2.6.26.3/drivers/mtd/Kconfig
---- linux-2.6.26.3.orig/drivers/mtd/Kconfig 2008-08-27 19:37:48.000000000 -0700
-+++ linux-2.6.26.3/drivers/mtd/Kconfig 2008-08-27 19:39:14.000000000 -0700
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
@@ -174,6 +174,12 @@
---help---
TI AR7 partitioning support
@@ -14,9 +13,8 @@ diff -ruN linux-2.6.26.3.orig/drivers/mtd/Kconfig linux-2.6.26.3/drivers/mtd/Kco
comment "User Modules And Translation Layers"
config MTD_CHAR
-diff -ruN linux-2.6.26.3.orig/drivers/mtd/Makefile linux-2.6.26.3/drivers/mtd/Makefile
---- linux-2.6.26.3.orig/drivers/mtd/Makefile 2008-08-27 19:37:48.000000000 -0700
-+++ linux-2.6.26.3/drivers/mtd/Makefile 2008-08-27 19:39:14.000000000 -0700
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
@@ -13,6 +13,7 @@
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
@@ -25,9 +23,8 @@ diff -ruN linux-2.6.26.3.orig/drivers/mtd/Makefile linux-2.6.26.3/drivers/mtd/Ma
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
-diff -ruN linux-2.6.26.3.orig/drivers/mtd/maps/physmap.c linux-2.6.26.3/drivers/mtd/maps/physmap.c
---- linux-2.6.26.3.orig/drivers/mtd/maps/physmap.c 2008-08-27 19:37:48.000000000 -0700
-+++ linux-2.6.26.3/drivers/mtd/maps/physmap.c 2008-08-27 19:39:14.000000000 -0700
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
@@ -87,7 +87,8 @@
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
diff --git a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
index cd5d744de1..a3ce669400 100644
--- a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
+++ b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
@@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -913,6 +913,15 @@
+@@ -960,6 +960,15 @@
To compile this driver as a module, choose M here: the
module will be called mwave.
@@ -18,7 +18,7 @@
depends on SCx200
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -90,6 +90,7 @@
+@@ -91,6 +91,7 @@
obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
diff --git a/target/linux/ar7/patches-2.6.26/130-vlynq.patch b/target/linux/ar7/patches-2.6.26/130-vlynq.patch
index 8fb613de5b..c1e04a6dbf 100644
--- a/target/linux/ar7/patches-2.6.26/130-vlynq.patch
+++ b/target/linux/ar7/patches-2.6.26/130-vlynq.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.26/drivers/Kconfig
-===================================================================
---- linux-2.6.26.orig/drivers/Kconfig 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.26/drivers/Kconfig 2008-07-14 12:28:00.186793402 +0200
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
@@ -100,5 +100,7 @@
source "drivers/uio/Kconfig"
@@ -10,10 +8,8 @@ Index: linux-2.6.26/drivers/Kconfig
+
source "drivers/xen/Kconfig"
endmenu
-Index: linux-2.6.26/drivers/Makefile
-===================================================================
---- linux-2.6.26.orig/drivers/Makefile 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.26/drivers/Makefile 2008-07-14 12:27:34.362789842 +0200
+--- a/drivers/Makefile
++++ b/drivers/Makefile
@@ -92,5 +92,6 @@
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
diff --git a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
index 6444cac88d..18477997e8 100644
--- a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
+++ b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -1874,7 +1874,7 @@
+@@ -1867,7 +1867,7 @@
config CPMAC
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
diff --git a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
index a40d4a3771..00709186ef 100644
--- a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
+++ b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
@@ -1,6 +1,6 @@
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -267,6 +267,13 @@
+@@ -266,6 +266,13 @@
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO,
},
@@ -14,7 +14,7 @@
};
#if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2455,7 +2462,11 @@
+@@ -2524,7 +2531,11 @@
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
diff --git a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
index 16e7320465..63ced873eb 100644
--- a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
+++ b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
@@ -17,8 +17,8 @@ because other drivers do it in the same way.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---- a/drivers/net/cpmac.c 2008-07-13 23:51:29.000000000 +0200
-+++ b/drivers/net/cpmac.c 2008-08-14 20:48:49.000000000 +0200
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
@@ -627,7 +627,7 @@
dev_kfree_skb_irq(desc->skb);
desc->skb = NULL;
diff --git a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
index 7da22cd99c..43479f881e 100644
--- a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
@@ -1,6 +1,6 @@
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
-@@ -936,7 +936,8 @@
+@@ -948,7 +948,8 @@
int new_state = 0;
spin_lock(&priv->lock);
@@ -10,7 +10,7 @@
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -948,11 +949,11 @@
+@@ -960,11 +961,11 @@
priv->oldspeed = priv->phy->speed;
}