[ARM] 5375/1: PATCH - update jornada720.c to reflect driver additions

This patch updates the list of devices activated at init
to also include the keyboard and touchscreen structs.
We also remove a non-needed #ifdef.

Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 12 insertions, 2 deletions

diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 81848aa9642..fd776bb666c 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -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)