Merge branch 'topic/snd-device' into for-next

1 files changed, 1 insertions, 1 deletions

diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index cd09c1b05c24..44e9c2f2a094 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -447,6 +447,7 @@ struct snd_pcm_str {
 #endif
 #endif
         struct snd_kcontrol *chmap_kctl; /* channel-mapping controls */
+        struct device dev;
 };
 
 struct snd_pcm {
@@ -463,7 +464,6 @@ struct snd_pcm {
         wait_queue_head_t open_wait;
         void *private_data;
         void (*private_free) (struct snd_pcm *pcm);
-        struct device *dev; /* actual hw device this belongs to */
         bool internal; /* pcm is for internal use only */
         bool nonatomic; /* whole PCM operations are in non-atomic context */
 #if defined(CONFIG_SND_PCM_OSS) || defined(CONFIG_SND_PCM_OSS_MODULE)