Skip to content

Commit

Permalink
[ARM] 5375/1: PATCH - update jornada720.c to reflect driver additions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kristoffer Ericson authored and Russell King committed Feb 10, 2009
1 parent 17198f2 commit b4e4112
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions arch/arm/mach-sa1100/jornada720.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit b4e4112

Please sign in to comment.