summaryrefslogtreecommitdiff
path: root/polux
diff options
context:
space:
mode:
Diffstat (limited to 'polux')
-rw-r--r--polux/linux-2.6.10/arch/arm/mach-mse500/core.c1
-rw-r--r--polux/linux-2.6.10/include/asm-arm/setup.h8
2 files changed, 4 insertions, 5 deletions
diff --git a/polux/linux-2.6.10/arch/arm/mach-mse500/core.c b/polux/linux-2.6.10/arch/arm/mach-mse500/core.c
index 6151e0b8bc..a1875b67f1 100644
--- a/polux/linux-2.6.10/arch/arm/mach-mse500/core.c
+++ b/polux/linux-2.6.10/arch/arm/mach-mse500/core.c
@@ -169,6 +169,7 @@ static void __init mse500_fixup(struct machine_desc *desc, struct tag *tags,
}
if(tags->hdr.tag == ATAG_MSE500)
{
+ /* We don't read plc_mem_size as we don't need it. */
nvram_offset = tags->u.mse500.nvram_offset;
tags->hdr.tag = ATAG_NONE;
tags->hdr.size = 0;
diff --git a/polux/linux-2.6.10/include/asm-arm/setup.h b/polux/linux-2.6.10/include/asm-arm/setup.h
index 80dcbb1c50..14f9effeeb 100644
--- a/polux/linux-2.6.10/include/asm-arm/setup.h
+++ b/polux/linux-2.6.10/include/asm-arm/setup.h
@@ -142,11 +142,9 @@ struct tag_memclk {
};
/* SPiDCOM MSE500 specific information */
-#define ATAG_MSE500 0x41000102
+#include <asm/arch/spc300-atag.h>
-struct tag_mse500 {
- u32 nvram_offset;
-};
+#define ATAG_MSE500 ATAG_SPC300
struct tag {
struct tag_header hdr;
@@ -174,7 +172,7 @@ struct tag {
/*
* MSE500 specific
*/
- struct tag_mse500 mse500;
+ struct tag_spc300 mse500;
} u;
};