diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-14 16:28:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-14 18:34:46 -0400 |
| commit | 53ffe3b440aa85af6fc4eda09b2d44bcdd312d4d (patch) | |
| tree | e3ee2f392c5f73c855367cee998fc2e5774fa267 /include/asm-arm/arch-pxa/irda.h | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | cabb352a6455c3550f157909196845f533b0f374 (diff) | |
[ARM] Merge most of the PXA work for initial merge
This includes PXA work up to the SPI changes for the initial merge,
since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI
tree being merged.
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'include/asm-arm/arch-pxa/irda.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/irda.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/irda.h b/include/asm-arm/arch-pxa/irda.h index 99f4f423a8e1..0a50c3c763df 100644 --- a/include/asm-arm/arch-pxa/irda.h +++ b/include/asm-arm/arch-pxa/irda.h | |||
| @@ -16,4 +16,8 @@ struct pxaficp_platform_data { | |||
| 16 | 16 | ||
| 17 | extern void pxa_set_ficp_info(struct pxaficp_platform_data *info); | 17 | extern void pxa_set_ficp_info(struct pxaficp_platform_data *info); |
| 18 | 18 | ||
| 19 | #if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x) | ||
| 20 | void pxa2xx_transceiver_mode(struct device *dev, int mode); | ||
| 21 | #endif | ||
| 22 | |||
| 19 | #endif | 23 | #endif |