leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Kristoffer Ericson 2009-02-04 16:47:38 +01:00 committed by Russell King
parent 17198f2d68
commit b4e411294a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/mach-sa1100/jornada720.c
View File

@ -226,12 +226,22 @@ static struct platform_device jornada_ssp_device = {
.id = -1, .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 = { static struct platform_device *devices[] __initdata = {
&sa1111_device, &sa1111_device,
#ifdef CONFIG_SA1100_JORNADA720_SSP
&jornada_ssp_device, &jornada_ssp_device,
#endif
&s1d13xxxfb_device, &s1d13xxxfb_device,
&jornada_kbd_device,
&jornada_ts_device,
}; };
static int __init jornada720_init(void) static int __init jornada720_init(void)