netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / arch / arm / mach-sa1100 / jornada720.c

diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 52ac37d..13ebd2d 100644 (file)
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -23,7 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <video/s1d13xxxfb.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
@@ -226,12 +226,22 @@ static struct platform_device jornada_ssp_device = {
        .id             = -1,
 };
 
+static struct platform_device jornada_kbd_device = {
+       .name           = "jornada720_kbd",
+       .id             = -1,
+};
+
+static struct platform_device jornada_ts_device = {
+       .name           = "jornada_ts",
+       .id             = -1,
+};
+
 static struct platform_device *devices[] __initdata = {
        &sa1111_device,
-#ifdef CONFIG_SA1100_JORNADA720_SSP
        &jornada_ssp_device,
-#endif
        &s1d13xxxfb_device,
+       &jornada_kbd_device,
+       &jornada_ts_device,
 };
 
 static int __init jornada720_init(void)
@@ -344,7 +354,7 @@ static struct resource jornada720_flash_resource = {
 
 static void __init jornada720_mach_init(void)
 {
-       sa11x0_set_flash_data(&jornada720_flash_data, &jornada720_flash_resource, 1);
+       sa11x0_register_mtd(&jornada720_flash_data, &jornada720_flash_resource, 1);
 }
 
 MACHINE_START(JORNADA720, "HP Jornada 720")