mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[ixp4xx] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11204 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c
|
||||
--- linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 20:51:57.000000000 +0200
|
||||
+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/compex-setup.c 2007-04-09 21:48:22.000000000 +0200
|
||||
Index: linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.21.7.orig/arch/arm/mach-ixp4xx/compex-setup.c
|
||||
+++ linux-2.6.21.7/arch/arm/mach-ixp4xx/compex-setup.c
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <linux/serial.h>
|
||||
#include <linux/tty.h>
|
||||
@@ -9,7 +10,7 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <asm/types.h>
|
||||
@@ -136,11 +137,34 @@
|
||||
@@ -136,11 +137,34 @@ static struct platform_device mac1 = {
|
||||
.resource = &res_mac1,
|
||||
};
|
||||
|
||||
@@ -44,7 +45,7 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
|
||||
};
|
||||
|
||||
static void __init compex_init(void)
|
||||
@@ -152,6 +176,8 @@
|
||||
@@ -152,6 +176,8 @@ static void __init compex_init(void)
|
||||
IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;
|
||||
|
||||
platform_add_devices(compex_devices, ARRAY_SIZE(compex_devices));
|
||||
@@ -52,4 +53,4 @@ diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/compex-setup.c linux-2.6.19.2-owrt
|
||||
+ register_mtd_user(&compex_flash_notifier);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ARCH_COMPEX
|
||||
#ifdef CONFIG_MACH_COMPEX
|
||||
|
||||
Reference in New Issue
Block a user