Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4e41129 authored by Kristoffer Ericson's avatar Kristoffer Ericson Committed by Russell King
Browse files

[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: default avatarKristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 17198f2d

arch/arm/mach-sa1100/jornada720.c

+12 −2
Original line number Diff line number Diff line
@@ -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)