sound: pci: hda: intel: fix bad merge
authorVarun Wadekar <vwadekar@nvidia.com>
Fri, 6 Apr 2012 20:59:00 +0000 (01:59 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Fri, 6 Apr 2012 20:59:00 +0000 (01:59 +0530)
commit278273d4d69f959090c65cbd32d9739aad21e199
tree0bfc79cfafd094813fc2e017d2cfa5b33add72d6
parent89afe0149a46f0eca233c141a599bf7844107930
sound: pci: hda: intel: fix bad merge

Change-Id: Iec21e6548a9c53286243a74125fec90bf96c6647
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
sound/pci/hda/hda_intel.c