aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.26
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-08-22 15:37:19 +0000
commit184c6b06f2bb29b693084174908c7a0f1b46e3d2 (patch)
treeeb6e3d897cf739fd60e1728c475b35141a76b0a4 /target/linux/ixp4xx/patches-2.6.26
parentbe1a9ff41dfeed9e00f165e6a661e26ccaa5549c (diff)
downloadupstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.gz
upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.bz2
upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.zip
update to 2.6.26.3 and 2.6.25.16
SVN-Revision: 12371
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.26')
-rw-r--r--target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch10
-rw-r--r--target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch4
-rw-r--r--target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch2
3 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch b/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
index 718ef3ce5e..da685ef74e 100644
--- a/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/116-sidewinder_fis_location.patch
@@ -1,15 +1,15 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
-@@ -13,6 +13,8 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
+@@ -15,6 +15,8 @@
+
+ #define BOARD_CONFIG_PART "boardconfig"
+#include <asm/mach-types.h>
+
struct fis_image_desc {
unsigned char name[16]; // Null terminated name
uint32_t flash_base; // Address within FLASH of image
-@@ -30,7 +32,8 @@
+@@ -32,7 +34,8 @@
struct fis_list *next;
};
@@ -19,7 +19,7 @@
module_param(directory, int, 0);
static inline int redboot_checksum(struct fis_image_desc *img)
-@@ -58,6 +61,8 @@
+@@ -61,6 +64,8 @@
#ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
static char nullstring[] = "unallocated";
#endif
diff --git a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
index 4eb1b7595f..f2d8fde550 100644
--- a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -99,6 +99,36 @@
+@@ -115,6 +115,36 @@
&wg302v1_eth[0],
};
@@ -37,7 +37,7 @@
static void __init wg302v1_init(void)
{
ixp4xx_sys_init();
-@@ -117,6 +147,7 @@
+@@ -133,6 +163,7 @@
/* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
diff --git a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
index c79a03fa4c..0fe2eb0526 100644
--- a/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/192-cambria_gpio_device.patch
@@ -44,4 +44,4 @@
+ platform_device_register(&cambria_gpio);
platform_device_register(&cambria_optional_uart);
- cambria_npec_data.phy = 2;
+ platform_device_register(&cambria_npec_device);