diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-20 09:03:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-20 09:03:04 -0400 |
| commit | 64bd43a086469a0bfdd87e012523184bdd96ce81 (patch) | |
| tree | f44ff7df4bae5ac265f68885663a790885895666 /include/sound | |
| parent | 4a014a240b5a3c3b167702948a22dbe9e9a150a8 (diff) | |
| parent | a48dc30da44769ea3f3562c18f54878a9a3e78a1 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pxa2xx-lib.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/sound/pxa2xx-lib.h b/include/sound/pxa2xx-lib.h index 2c894b600e5b..2fd3d251d9a5 100644 --- a/include/sound/pxa2xx-lib.h +++ b/include/sound/pxa2xx-lib.h | |||
| @@ -42,19 +42,4 @@ extern int pxa2xx_ac97_hw_resume(void); | |||
| 42 | extern int pxa2xx_ac97_hw_probe(struct platform_device *dev); | 42 | extern int pxa2xx_ac97_hw_probe(struct platform_device *dev); |
| 43 | extern void pxa2xx_ac97_hw_remove(struct platform_device *dev); | 43 | extern void pxa2xx_ac97_hw_remove(struct platform_device *dev); |
| 44 | 44 | ||
| 45 | /* AC97 platform_data */ | ||
| 46 | /** | ||
| 47 | * struct pxa2xx_ac97_platform_data - pxa ac97 platform data | ||
| 48 | * @reset_gpio: AC97 reset gpio (normally gpio113 or gpio95) | ||
| 49 | * a -1 value means no gpio will be used for reset | ||
| 50 | * | ||
| 51 | * Platform data should only be specified for pxa27x CPUs where a silicon bug | ||
| 52 | * prevents correct operation of the reset line. If not specified, the default | ||
| 53 | * behaviour is to consider gpio 113 as the AC97 reset line, which is the | ||
| 54 | * default on most boards. | ||
| 55 | */ | ||
| 56 | struct pxa2xx_ac97_platform_data { | ||
| 57 | int reset_gpio; | ||
| 58 | }; | ||
| 59 | |||
| 60 | #endif | 45 | #endif |