upgrade to 2.6.25.7, and refresh patches
SVN-Revision: 11523
This commit is contained in:
@@ -1,18 +1,14 @@
|
||||
Index: linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S
|
||||
===================================================================
|
||||
--- linux-2.6.25.4.orig/arch/cris/arch-v10/lib/hw_settings.S
|
||||
+++ linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S
|
||||
--- a/arch/cris/arch-v10/lib/hw_settings.S
|
||||
+++ b/arch/cris/arch-v10/lib/hw_settings.S
|
||||
@@ -60,3 +60,5 @@
|
||||
.dword R_PORT_PB_SET
|
||||
.dword PB_SET_VALUE
|
||||
.dword 0 ; No more register values
|
||||
+ .ascii "ACME_PART_MAGIC"
|
||||
+ .dword 0xdeadc0de
|
||||
Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.4.orig/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
+++ linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
|
||||
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
@@ -113,7 +113,7 @@
|
||||
|
||||
/* If no partition-table was found, we use this default-set. */
|
||||
#define MAX_PARTITIONS 7
|
||||
@@ -21,7 +17,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
|
||||
/*
|
||||
* Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
|
||||
@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
|
||||
@@ -122,19 +122,14 @@
|
||||
*/
|
||||
static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
|
||||
{
|
||||
@@ -46,7 +42,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
}
|
||||
};
|
||||
|
||||
@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
|
||||
@@ -281,6 +276,11 @@
|
||||
struct partitiontable_entry *ptable;
|
||||
int use_default_ptable = 1; /* Until proven otherwise. */
|
||||
const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n";
|
||||
@@ -58,7 +54,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||
|
||||
if (!(mymtd = flash_probe())) {
|
||||
/* There's no reason to use this module if no flash chip can
|
||||
@@ -292,6 +292,31 @@ static int __init init_axis_flash(void)
|
||||
@@ -292,6 +292,31 @@
|
||||
mymtd->name, mymtd->size);
|
||||
axisflash_mtd = mymtd;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user