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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
trizeps4.c
diff --git
a/arch/arm/mach-pxa/trizeps4.c
b/arch/arm/mach-pxa/trizeps4.c
index
61e2440
..
dee7bf3
100644
(file)
--- a/
arch/arm/mach-pxa/trizeps4.c
+++ b/
arch/arm/mach-pxa/trizeps4.c
@@
-254,6
+254,7
@@
static void board_irda_mode(struct device *dev, int mode)
/* Fast mode */
trizeps_conxs_ircr |= ConXS_IRCR_MODE;
}
+ pxa2xx_transceiver_mode(dev, mode);
if (mode & IR_OFF) {
trizeps_conxs_ircr |= ConXS_IRCR_SD;
} else {