diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 10:17:03 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 10:17:03 +0000 |
| commit | 60289aade7304b10112a6839dcf293e719f057eb (patch) | |
| tree | b992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch | |
| parent | 9fcaee9fccd3fc3605de7c3578013211b8486827 (diff) | |
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch index e35ddbe33..7f2d611aa 100644 --- a/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch +++ b/target/linux/ixp4xx/patches-2.6.25/300-avila_fetch_mac.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c =================================================================== ---- linux-2.6.24.2.orig/arch/arm/mach-ixp4xx/avila-setup.c -+++ linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c +--- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/avila-setup.c ++++ linux-2.6.25.1/arch/arm/mach-ixp4xx/avila-setup.c @@ -14,10 +14,18 @@ #include <linux/kernel.h> #include <linux/init.h> @@ -35,9 +35,9 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c static struct flash_platform_data avila_flash_data = { .map_name = "cfi_probe", .width = 2, -@@ -192,10 +207,160 @@ static void __init avila_fixup(struct ma - t->hdr.size = 0; - } +@@ -163,10 +178,160 @@ static struct platform_device *avila_dev + &avila_uart + }; +static void __init avila_gw23xx_setup(void) +{ @@ -196,7 +196,7 @@ Index: linux-2.6.24.2/arch/arm/mach-ixp4xx/avila-setup.c avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); avila_flash_resource.end = IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; -@@ -213,9 +378,28 @@ static void __init avila_init(void) +@@ -184,9 +349,28 @@ static void __init avila_init(void) platform_device_register(&avila_pata); |