git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
sn95031.c
diff --git
a/sound/soc/codecs/sn95031.c
b/sound/soc/codecs/sn95031.c
index
2a30eae
..
4d9fb27
100644
(file)
--- a/
sound/soc/codecs/sn95031.c
+++ b/
sound/soc/codecs/sn95031.c
@@
-26,7
+26,9
@@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/platform_device.h>
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/platform_device.h>
+#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/slab.h>
+
#include <asm/intel_scu_ipc.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <asm/intel_scu_ipc.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@
-925,7
+927,7
@@
static struct platform_driver sn95031_codec_driver = {
.owner = THIS_MODULE,
},
.probe = sn95031_device_probe,
.owner = THIS_MODULE,
},
.probe = sn95031_device_probe,
- .remove =
sn95031_device_remove
,
+ .remove =
__devexit_p(sn95031_device_remove)
,
};
static int __init sn95031_init(void)
};
static int __init sn95031_init(void)