diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-09 11:15:10 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-09 11:15:10 +0100 |
commit | 6e03a61544c368c2c3ff946c1ce7807e5c36a527 (patch) | |
tree | 29253331da9680b5f81ba8715202044f45861666 /arch/arm/mach-ep93xx/include/mach/platform.h | |
parent | 9eb34302681d3f6cf0b186aae31ba08cbd5f22fb (diff) | |
parent | ed67ea82c0d9a163458dc6a69a7a3123db1a8b3b (diff) | |
download | linux-3.10-6e03a61544c368c2c3ff946c1ce7807e5c36a527.tar.gz linux-3.10-6e03a61544c368c2c3ff946c1ce7807e5c36a527.tar.bz2 linux-3.10-6e03a61544c368c2c3ff946c1ce7807e5c36a527.zip |
Merge branch 'ep93xx' into for-2.6.36
Trivial add/add fixup required in the clock table.
Conflicts:
arch/arm/mach-ep93xx/clock.c
Diffstat (limited to 'arch/arm/mach-ep93xx/include/mach/platform.h')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/platform.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h b/arch/arm/mach-ep93xx/include/mach/platform.h index 9a4413dd44b..99eff877a14 100644 --- a/arch/arm/mach-ep93xx/include/mach/platform.h +++ b/arch/arm/mach-ep93xx/include/mach/platform.h @@ -55,6 +55,9 @@ void ep93xx_pwm_release_gpio(struct platform_device *pdev); void ep93xx_register_keypad(struct ep93xx_keypad_platform_data *data); int ep93xx_keypad_acquire_gpio(struct platform_device *pdev); void ep93xx_keypad_release_gpio(struct platform_device *pdev); +void ep93xx_register_i2s(void); +int ep93xx_i2s_acquire(unsigned i2s_pins, unsigned i2s_config); +void ep93xx_i2s_release(void); void ep93xx_init_devices(void); extern struct sys_timer ep93xx_timer; |