← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to sound/soc/codecs/wm8904.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/soc/codecs/wm8904.c
50
50
struct wm8904_priv {
51
51
 
52
52
        enum wm8904_type devtype;
53
 
        void *control_data;
54
53
 
55
54
        struct regulator_bulk_data supplies[WM8904_NUM_SUPPLIES];
56
55
 
2540
2539
 
2541
2540
        wm8904->devtype = id->driver_data;
2542
2541
        i2c_set_clientdata(i2c, wm8904);
2543
 
        wm8904->control_data = i2c;
2544
2542
        wm8904->pdata = i2c->dev.platform_data;
2545
2543
 
2546
2544
        ret = snd_soc_register_codec(&i2c->dev,
2560
2558
static const struct i2c_device_id wm8904_i2c_id[] = {
2561
2559
        { "wm8904", WM8904 },
2562
2560
        { "wm8912", WM8912 },
 
2561
        { "wm8918", WM8904 },   /* Actually a subset, updates to follow */
2563
2562
        { }
2564
2563
};
2565
2564
MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id);