diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 11:22:50 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-17 11:22:50 +0000 |
commit | 8eb41582d2106eccc7717047d1184481f5a1b3a6 (patch) | |
tree | 12257bbe39b5c8ae6918198fde682ed0aacd8e00 /sound/soc/omap/mcpdm.h | |
parent | 127d4eb97b7bebc15fd692603263e75c220e24f9 (diff) | |
parent | 1cb17e2dbd09436069733500ea48e0c9b1f0a1cc (diff) | |
download | op-kernel-dev-8eb41582d2106eccc7717047d1184481f5a1b3a6.zip op-kernel-dev-8eb41582d2106eccc7717047d1184481f5a1b3a6.tar.gz |
Merge branch 'ep93xx/board' into next/board
Diffstat (limited to 'sound/soc/omap/mcpdm.h')
-rw-r--r-- | sound/soc/omap/mcpdm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/mcpdm.h b/sound/soc/omap/mcpdm.h index df3e16f..20c20a8 100644 --- a/sound/soc/omap/mcpdm.h +++ b/sound/soc/omap/mcpdm.h @@ -150,4 +150,4 @@ extern int omap_mcpdm_request(void); extern void omap_mcpdm_free(void); extern int omap_mcpdm_set_offset(int offset1, int offset2); int __devinit omap_mcpdm_probe(struct platform_device *pdev); -int __devexit omap_mcpdm_remove(struct platform_device *pdev); +int omap_mcpdm_remove(struct platform_device *pdev); |