diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:05:50 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-24 13:05:50 -0400 |
| commit | 698158c799c7961824ccdb773250e16c0dd5d9e4 (patch) | |
| tree | 96f034be9e9a95e6f68b5d20d1a3df7a3cbf724a /arch/arm/mach-pxa/trizeps4.c | |
| parent | 4c7827eec78abe6fe68fd29305806467f2a51e63 (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/trizeps4.c')
| -rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 61e244023089..dee7bf36f013 100644 --- 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) | |||
| 254 | /* Fast mode */ | 254 | /* Fast mode */ |
| 255 | trizeps_conxs_ircr |= ConXS_IRCR_MODE; | 255 | trizeps_conxs_ircr |= ConXS_IRCR_MODE; |
| 256 | } | 256 | } |
| 257 | pxa2xx_transceiver_mode(dev, mode); | ||
| 257 | if (mode & IR_OFF) { | 258 | if (mode & IR_OFF) { |
| 258 | trizeps_conxs_ircr |= ConXS_IRCR_SD; | 259 | trizeps_conxs_ircr |= ConXS_IRCR_SD; |
| 259 | } else { | 260 | } else { |