diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 16:41:33 +0000 |
| commit | bff468813f78f81e36ebb2a3f4354de7365e640f (patch) | |
| tree | e0144a8d723cac2fd84505ec140dd0011541430a /target/linux/rdc-2.6 | |
| parent | 7ca328b65927e12b4bb65a6d752f43b674498908 (diff) | |
| download | mtk-20170518-bff468813f78f81e36ebb2a3f4354de7365e640f.zip mtk-20170518-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.gz mtk-20170518-bff468813f78f81e36ebb2a3f4354de7365e640f.tar.bz2 | |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
SVN-Revision: 5789
Diffstat (limited to 'target/linux/rdc-2.6')
| -rw-r--r-- | target/linux/rdc-2.6/Makefile | 4 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/000-rdc_fixes.patch | 2 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch | 2 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/002-r6040_ethernet.patch | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc-2.6/Makefile index 1269676..e385659 100644 --- a/target/linux/rdc-2.6/Makefile +++ b/target/linux/rdc-2.6/Makefile @@ -16,9 +16,9 @@ define Target/Description (e.g. Airlink101 AR525W) endef -LINUX_VERSION:=2.6.17 +LINUX_VERSION:=2.6.19 LINUX_RELEASE:=1 -LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e +LINUX_KERNEL_MD5SUM:=443c265b57e87eadc0c677c3acc37e20 include $(INCLUDE_DIR)/kernel-build.mk diff --git a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch index 5e3878d..d62f938 100644 --- a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch +++ b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch @@ -783,7 +783,7 @@ diff -urN linux-2.6.17/arch/i386/mach-rdc/led.h linux-2.6.17.new/arch/i386/mach- +#ifndef _LED_H_INCLUDED +#define _LED_H_INCLUDED + -+#include <linux/config.h> ++#include <linux/autoconf.h> + +#define LED_VERSION "v1.0" +#define LED_MAJOR 166 diff --git a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch b/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch index a3d2ac6..6b4b2af 100644 --- a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch +++ b/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch @@ -74,7 +74,7 @@ diff -urN linux-2.6.17/drivers/mtd/maps/rdc3210.c linux-2.6.17.new/drivers/mtd/m +#include <linux/mtd/mtd.h> +#include <linux/mtd/map.h> +#include <linux/mtd/partitions.h> -+#include <linux/config.h> ++#include <linux/autoconf.h> + +#define WINDOW_ADDR 0xFFC00000 +#define WINDOW_SIZE 0x00400000 diff --git a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch b/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch index 88a9ea1..1402369 100644 --- a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch +++ b/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch @@ -187,7 +187,7 @@ diff -urN linux-2.6.17/drivers/net/r6040.c linux-2.6.17.new/drivers/net/r6040.c + +static int rdc_open(struct net_device *dev); +static int rdc_start_xmit(struct sk_buff *skb, struct net_device *dev); -+static irqreturn_t rdc_interrupt(int irq, void *dev_id, struct pt_regs *regs); ++static irqreturn_t rdc_interrupt(int irq, void *dev_id); +static struct net_device_stats *rdc_get_stats(struct net_device *dev); +static int rdc_close(struct net_device *dev); +static void set_multicast_list(struct net_device *dev); @@ -439,7 +439,7 @@ diff -urN linux-2.6.17/drivers/net/r6040.c linux-2.6.17.new/drivers/net/r6040.c + +/* The RDC interrupt handler. */ +static irqreturn_t -+rdc_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++rdc_interrupt(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct rdc_private *lp; |