diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-03-09 20:31:31 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-03-09 23:07:07 +0100 |
| commit | f99dcb09ffdb4f90d5d005002787bbf90f3f337b (patch) | |
| tree | aecadf55b4037b3012d25c50ae790870e3edd068 | |
| parent | bffce78a9120e28f69493e566d0ac75ae19f47d0 (diff) | |
| download | kernel_goldelico_gta04-f99dcb09ffdb4f90d5d005002787bbf90f3f337b.zip kernel_goldelico_gta04-f99dcb09ffdb4f90d5d005002787bbf90f3f337b.tar.gz kernel_goldelico_gta04-f99dcb09ffdb4f90d5d005002787bbf90f3f337b.tar.bz2 | |
Update codecs for 3.8
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
| -rw-r--r-- | sound/soc/codecs/gtm601.c | 6 | ||||
| -rw-r--r-- | sound/soc/codecs/w2cbw003-bt.c | 6 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-audio.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/gtm601.c b/sound/soc/codecs/gtm601.c index 6c5edbe..0716394 100644 --- a/sound/soc/codecs/gtm601.c +++ b/sound/soc/codecs/gtm601.c @@ -56,13 +56,13 @@ struct snd_soc_dai_driver gtm601_dai = { struct snd_soc_codec_driver soc_codec_dev_gtm601; -static __devinit int gtm601_platform_probe(struct platform_device *pdev) +static int gtm601_platform_probe(struct platform_device *pdev) { return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_gtm601, >m601_dai, 1); } -static int __devexit gtm601_platform_remove(struct platform_device *pdev) +static int gtm601_platform_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; @@ -77,7 +77,7 @@ static struct platform_driver gtm601_codec_driver = { }, .probe = gtm601_platform_probe, - .remove = __devexit_p(gtm601_platform_remove), + .remove = gtm601_platform_remove, }; static int __init gtm601_init(void) diff --git a/sound/soc/codecs/w2cbw003-bt.c b/sound/soc/codecs/w2cbw003-bt.c index f2cd41e..b472503 100644 --- a/sound/soc/codecs/w2cbw003-bt.c +++ b/sound/soc/codecs/w2cbw003-bt.c @@ -61,13 +61,13 @@ struct snd_soc_dai_driver w2cbw003_dai = { struct snd_soc_codec_driver soc_codec_dev_w2cbw003; -static __devinit int w2cbw003_platform_probe(struct platform_device *pdev) +static int w2cbw003_platform_probe(struct platform_device *pdev) { return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_w2cbw003, &w2cbw003_dai, 1); } -static int __devexit w2cbw003_platform_remove(struct platform_device *pdev) +static int w2cbw003_platform_remove(struct platform_device *pdev) { snd_soc_unregister_codec(&pdev->dev); return 0; @@ -82,7 +82,7 @@ static struct platform_driver w2cbw003_codec_driver = { }, .probe = w2cbw003_platform_probe, - .remove = __devexit_p(w2cbw003_platform_remove), + .remove = w2cbw003_platform_remove, }; static int __init w2cbw003_init(void) diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c index 83fb150..ae52a60 100644 --- a/sound/soc/omap/gta04-audio.c +++ b/sound/soc/omap/gta04-audio.c @@ -32,7 +32,7 @@ #include <asm/mach-types.h> #include <mach/hardware.h> -#include <mach/gpio.h> +#include <linux/gpio.h> #include <linux/i2c/twl4030-madc.h> |