diff options
| author |   Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 20:03:21 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 20:03:21 +0200 |
| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 (patch) | |
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 /sound/soc/codecs/wm_hubs.h | |
| parent | block: Update to io-controller stats (diff) | |
| parent | Linux 2.6.34-rc4 (diff) | |
| download | linux-dev-4facdaec1ce186e731e6baa04f074804849e9a49.tar.xz linux-dev-4facdaec1ce186e731e6baa04f074804849e9a49.zip | |
Merge branch 'master' into for-2.6.35
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'sound/soc/codecs/wm_hubs.h')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_hubs.h b/sound/soc/codecs/wm_hubs.h index 420104fe9c90..e51c16683589 100644 --- a/sound/soc/codecs/wm_hubs.h +++ b/sound/soc/codecs/wm_hubs.h @@ -21,6 +21,7 @@ extern const unsigned int wm_hubs_spkmix_tlv[]; /* This *must* be the first element of the codec->private_data struct */ struct wm_hubs_data { int dcs_codes; + int dcs_readback_mode; int hp_startup_mode; }; |