generic: fix min/max confusion in jffs2_sum_init on 2.6.32
[openwrt.git] / target / linux / ep93xx / patches-2.6.30 / 012-ep93xx-cpuinfo.patch
1 Index: linux-2.6.30.9/arch/arm/kernel/setup.c
2 ===================================================================
3 --- linux-2.6.30.9.orig/arch/arm/kernel/setup.c 2009-11-24 21:00:10.000000000 +0100
4 +++ linux-2.6.30.9/arch/arm/kernel/setup.c 2009-11-24 21:00:46.000000000 +0100
5 @@ -42,6 +42,10 @@
6 #include <asm/traps.h>
7 #include <asm/unwind.h>
8
9 +#if defined(CONFIG_ARCH_EP93XX)
10 +#include <mach/ep93xx-regs.h>
11 +#endif
12 +
13 #include "compat.h"
14 #include "atags.h"
15
16 @@ -844,9 +848,16 @@
17 seq_puts(m, "\n");
18
19 seq_printf(m, "Hardware\t: %s\n", machine_name);
20 +#if defined(CONFIG_ARCH_EP93XX)
21 + seq_printf(m, "Revision\t: %04x\n",
22 + *((unsigned int *)EP93XX_SYSCON_CHIP_ID) >> 28);
23 + seq_printf(m, "Serial\t\t: %016x\n",
24 + *((unsigned int *)EP93XX_SECURITY_UNIQID));
25 +#else
26 seq_printf(m, "Revision\t: %04x\n", system_rev);
27 seq_printf(m, "Serial\t\t: %08x%08x\n",
28 system_serial_high, system_serial_low);
29 +#endif
30
31 return 0;
32 }
This page took 0.052438 seconds and 5 git commands to generate.