diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:29:54 -0400 |
| commit | 3784fd7316d336f2ba79b6c7c8168d08eff8a714 (patch) | |
| tree | 3019c37f1ba588f252d1a9f1ef33beb5d3d683b1 /include/asm-arm/arch-pxa/ssp.h | |
| parent | 7c440e7990ea22c0c374c59a5fbd79b0579d1517 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-arm/arch-pxa/ssp.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/ssp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-pxa/ssp.h b/include/asm-arm/arch-pxa/ssp.h index 949878c0d908..ea200551a75f 100644 --- a/include/asm-arm/arch-pxa/ssp.h +++ b/include/asm-arm/arch-pxa/ssp.h | |||
| @@ -40,8 +40,8 @@ struct ssp_dev { | |||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | int ssp_write_word(struct ssp_dev *dev, u32 data); | 42 | int ssp_write_word(struct ssp_dev *dev, u32 data); |
| 43 | int ssp_read_word(struct ssp_dev *dev); | 43 | int ssp_read_word(struct ssp_dev *dev, u32 *data); |
| 44 | void ssp_flush(struct ssp_dev *dev); | 44 | int ssp_flush(struct ssp_dev *dev); |
| 45 | void ssp_enable(struct ssp_dev *dev); | 45 | void ssp_enable(struct ssp_dev *dev); |
| 46 | void ssp_disable(struct ssp_dev *dev); | 46 | void ssp_disable(struct ssp_dev *dev); |
| 47 | void ssp_save_state(struct ssp_dev *dev, struct ssp_state *ssp); | 47 | void ssp_save_state(struct ssp_dev *dev, struct ssp_state *ssp); |