diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 15:32:46 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 15:32:46 +0200 |
commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /sound/pci/cs5530.c | |
parent | mtd: mpc5121_nfc: Changed SVR check to allow MPC5123. (diff) | |
parent | Linux 2.6.34-rc7 (diff) | |
download | linux-0ae28a35bcb7984838acbf28bfba9c030f8b74f0.tar.xz linux-0ae28a35bcb7984838acbf28bfba9c030f8b74f0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'sound/pci/cs5530.c')
-rw-r--r-- | sound/pci/cs5530.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c index 207479a641cf..bc07e275d4d4 100644 --- a/sound/pci/cs5530.c +++ b/sound/pci/cs5530.c @@ -39,6 +39,7 @@ #include <linux/delay.h> #include <linux/moduleparam.h> #include <linux/pci.h> +#include <linux/slab.h> #include <sound/core.h> #include <sound/sb.h> #include <sound/initval.h> |