1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

[kernel] upgrade to 2.6.25.7, and refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2008-06-17 12:57:04 +00:00
parent 9ebfa7d89a
commit ad91de86f5
61 changed files with 435 additions and 683 deletions

View File

@@ -10,11 +10,9 @@ Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
arch/mips/au1000/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Index: linux-2.6.25.4/arch/mips/au1000/Kconfig
===================================================================
--- linux-2.6.25.4.orig/arch/mips/au1000/Kconfig
+++ linux-2.6.25.4/arch/mips/au1000/Kconfig
@@ -135,3 +135,4 @@ config SOC_AU1X00
--- a/arch/mips/au1000/Kconfig
+++ b/arch/mips/au1000/Kconfig
@@ -135,3 +135,4 @@
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_APM_EMULATION
select SYS_SUPPORTS_KGDB

View File

@@ -2,10 +2,8 @@ This patch adds support for the GPIO connected system button on the MTX-1 boards
Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
---
Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/au1000/mtx-1/platform.c
+++ linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
@@ -23,9 +23,32 @@
#include <linux/types.h>
#include <linux/platform_device.h>
@@ -39,7 +37,7 @@ Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
static struct resource mtx1_wdt_res[] = {
[0] = {
.start = 15,
@@ -62,11 +85,13 @@ static struct platform_device mtx1_gpio_
@@ -62,11 +85,13 @@
static struct platform_device *mtx1_devs[] = {
&mtx1_gpio_leds,

View File

@@ -1,7 +1,5 @@
Index: linux-2.6.25.4/drivers/net/au1000_eth.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/au1000_eth.c
+++ linux-2.6.25.4/drivers/net/au1000_eth.c
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -15,6 +15,9 @@
* Author: MontaVista Software, Inc.
* ppopov@mvista.com or source@mvista.com
@@ -12,7 +10,7 @@ Index: linux-2.6.25.4/drivers/net/au1000_eth.c
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it
@@ -835,6 +838,10 @@ static int au1000_init(struct net_device
@@ -835,6 +838,10 @@
control = MAC_RX_ENABLE | MAC_TX_ENABLE;
#ifndef CONFIG_CPU_LITTLE_ENDIAN

View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/init.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/au1000/mtx-1/init.c
+++ linux-2.6.25.4/arch/mips/au1000/mtx-1/init.c
@@ -54,7 +54,7 @@ void __init prom_init(void)
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -54,7 +54,7 @@
prom_argv = (char **) fw_arg1;
prom_envp = (char **) fw_arg2;

View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/mtd/maps/mtx-1_flash.c
===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/maps/mtx-1_flash.c
+++ linux-2.6.25.4/drivers/mtd/maps/mtx-1_flash.c
@@ -28,7 +28,7 @@ static struct map_info mtx1_map = {
--- a/drivers/mtd/maps/mtx-1_flash.c
+++ b/drivers/mtd/maps/mtx-1_flash.c
@@ -28,7 +28,7 @@
static struct mtd_partition mtx1_partitions[] = {
{

View File

@@ -1,8 +1,6 @@
Index: linux-2.6.25.4/drivers/net/au1000_eth.c
===================================================================
--- linux-2.6.25.4.orig/drivers/net/au1000_eth.c
+++ linux-2.6.25.4/drivers/net/au1000_eth.c
@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -1306,9 +1306,12 @@
}
}

View File

@@ -1,7 +1,5 @@
Index: linux-2.6.25.4/arch/mips/au1000/common/pci.c
===================================================================
--- linux-2.6.25.4.orig/arch/mips/au1000/common/pci.c
+++ linux-2.6.25.4/arch/mips/au1000/common/pci.c
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -39,15 +39,15 @@
/* TBD */

View File

@@ -1,7 +1,5 @@
Index: linux-2.6.25.4/include/asm-mips/mach-au1x00/au1000.h
===================================================================
--- linux-2.6.25.4.orig/include/asm-mips/mach-au1x00/au1000.h 2008-06-06 20:51:08.000000000 +0100
+++ linux-2.6.25.4/include/asm-mips/mach-au1x00/au1000.h 2008-06-06 20:51:48.000000000 +0100
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
@@ -623,6 +623,7 @@
AU1000_RTC_MATCH1_INT,
AU1000_RTC_MATCH2_INT,