diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-10 20:41:54 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-10 20:41:54 +0400 |
| commit | c18ab0bac4c377b22e03f9cd4efafa1316b76552 (patch) | |
| tree | 57049641755e7e01d6da9a902ac662a28b688b0b /arch/arm/mach-davinci/cdce949.c | |
| parent | 065380f0880dd651eb405430745926dc4747b759 (diff) | |
| parent | 49a170bcf28af5ef372cdbed7750ba8d4162bb0e (diff) | |
| download | linux-c18ab0bac4c377b22e03f9cd4efafa1316b76552.tar.xz | |
Merge tag 'asoc-fix-3.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.8
Nothing terribly exciting here except for the DOUBLE_RANGE fix which
just hadn't worked before, nobody noticed due to lack of use.
Diffstat (limited to 'arch/arm/mach-davinci/cdce949.c')
| -rw-r--r-- | arch/arm/mach-davinci/cdce949.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/cdce949.c b/arch/arm/mach-davinci/cdce949.c index f2232ca6d070..abafb92031c0 100644 --- a/arch/arm/mach-davinci/cdce949.c +++ b/arch/arm/mach-davinci/cdce949.c @@ -256,7 +256,7 @@ static int cdce_probe(struct i2c_client *client, return 0; } -static int __devexit cdce_remove(struct i2c_client *client) +static int cdce_remove(struct i2c_client *client) { cdce_i2c_client = NULL; return 0; @@ -274,7 +274,7 @@ static struct i2c_driver cdce_driver = { .name = "cdce949", }, .probe = cdce_probe, - .remove = __devexit_p(cdce_remove), + .remove = cdce_remove, .id_table = cdce_id, }; |