diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 13:05:49 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 13:05:49 +0200 |
commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
tree | a6063f77bd719d933823915d2273eaadb6331611 /include/asm-arm/arch-pxa/pxa2xx_spi.h | |
parent | Merge branch 'imx' into devel (diff) | |
parent | [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR) (diff) | |
download | linux-044e5f45e4ad890d03bd1e8bb44c634397cac24d.tar.xz linux-044e5f45e4ad890d03bd1e8bb44c634397cac24d.zip |
Merge branch 'pxa' into devel
Conflicts:
arch/arm/configs/em_x270_defconfig
arch/arm/configs/xm_x270_defconfig
Diffstat (limited to 'include/asm-arm/arch-pxa/pxa2xx_spi.h')
-rw-r--r-- | include/asm-arm/arch-pxa/pxa2xx_spi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/pxa2xx_spi.h b/include/asm-arm/arch-pxa/pxa2xx_spi.h index 3459fb26ce97..2206cb61a9f9 100644 --- a/include/asm-arm/arch-pxa/pxa2xx_spi.h +++ b/include/asm-arm/arch-pxa/pxa2xx_spi.h @@ -41,4 +41,6 @@ struct pxa2xx_spi_chip { void (*cs_control)(u32 command); }; +extern void pxa2xx_set_spi_info(unsigned id, struct pxa2xx_spi_master *info); + #endif /*PXA2XX_SPI_H_*/ |