diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-03 09:55:44 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-03 09:55:44 +0100 |
| commit | eb10149d17784ad28061ba6c29025a2ef0a5e71a (patch) | |
| tree | d22b6b196d8c7550d0bb1e6c39bc0b5623fa53e6 /include/linux/i2c-omap.h | |
| parent | dda415d41882449f841f88d829dd65b6ee1c374c (diff) | |
| parent | 854ea639bb6b0b7ec433e0a59405f4f199ffae4f (diff) | |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Very quiet release for ASoC really:
- Standardisation of the logging.
- DT and dmaengine support for Atmel.
- Support for Wolfson ADSP cores.
- New drivers for Freescale/iVeia P1022 and Maxim MAX98090.
Diffstat (limited to 'include/linux/i2c-omap.h')
| -rw-r--r-- | include/linux/i2c-omap.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c-omap.h b/include/linux/i2c-omap.h index df804ba73e0..92a0dc75bc7 100644 --- a/include/linux/i2c-omap.h +++ b/include/linux/i2c-omap.h @@ -34,6 +34,7 @@ struct omap_i2c_bus_platform_data { u32 clkrate; u32 rev; u32 flags; + void (*set_mpu_wkup_lat)(struct device *dev, long set); }; #endif |