git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
leds.c
diff --git
a/arch/arm/mach-omap1/leds.c
b/arch/arm/mach-omap1/leds.c
index
8ab21fe
..
3f9dcac
100644
(file)
--- a/
arch/arm/mach-omap1/leds.c
+++ b/
arch/arm/mach-omap1/leds.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/arch/arm/mach-omap/leds.c
+ * linux/arch/arm/mach-omap
1
/leds.c
*
* OMAP LEDs dispatcher
*/
*
* OMAP LEDs dispatcher
*/
@@
-20,7
+20,9
@@
omap_leds_init(void)
if (machine_is_omap_innovator())
leds_event = innovator_leds_event;
if (machine_is_omap_innovator())
leds_event = innovator_leds_event;
- else if (machine_is_omap_h2() || machine_is_omap_perseus2())
+ else if (machine_is_omap_h2()
+ || machine_is_omap_h3()
+ || machine_is_omap_perseus2())
leds_event = h2p2_dbg_leds_event;
else if (machine_is_omap_osk())
leds_event = h2p2_dbg_leds_event;
else if (machine_is_omap_osk())
@@
-30,8
+32,11
@@
omap_leds_init(void)
return -1;
if (machine_is_omap_h2()
return -1;
if (machine_is_omap_h2()
- || machine_is_omap_perseus2()
- || machine_is_omap_osk()) {
+ || machine_is_omap_h3()
+#ifdef CONFIG_OMAP_OSK_MISTRAL
+ || machine_is_omap_osk()
+#endif
+ ) {
/* LED1/LED2 pins can be used as GPIO (as done here), or by
* the LPG (works even in deep sleep!), to drive a bicolor
/* LED1/LED2 pins can be used as GPIO (as done here), or by
* the LPG (works even in deep sleep!), to drive a bicolor