diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-13 07:05:49 -0400 |
| commit | 044e5f45e4ad890d03bd1e8bb44c634397cac24d (patch) | |
| tree | a6063f77bd719d933823915d2273eaadb6331611 /include/asm-arm/arch-pxa/audio.h | |
| parent | f0006314d37639714da9658cf4ff3f1f9f420764 (diff) | |
| parent | faf64ed4968e354624f330c6da6c1ce8b05a0713 (diff) | |
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/audio.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/audio.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/audio.h b/include/asm-arm/arch-pxa/audio.h index 52bbe3bc25e1..f82f96dd1053 100644 --- a/include/asm-arm/arch-pxa/audio.h +++ b/include/asm-arm/arch-pxa/audio.h | |||
| @@ -12,4 +12,6 @@ typedef struct { | |||
| 12 | void *priv; | 12 | void *priv; |
| 13 | } pxa2xx_audio_ops_t; | 13 | } pxa2xx_audio_ops_t; |
| 14 | 14 | ||
| 15 | extern void pxa_set_ac97_info(pxa2xx_audio_ops_t *ops); | ||
| 16 | |||
| 15 | #endif | 17 | #endif |