diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 14:32:46 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 14:32:46 +0100 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /sound/ppc | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
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/ppc')
| -rw-r--r-- | sound/ppc/burgundy.c | 1 | ||||
| -rw-r--r-- | sound/ppc/keywest.c | 1 | ||||
| -rw-r--r-- | sound/ppc/snd_ps3.c | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c index 1f72e1c786b..00e2d5166d0 100644 --- a/sound/ppc/burgundy.c +++ b/sound/ppc/burgundy.c @@ -21,7 +21,6 @@ #include <asm/io.h> #include <linux/init.h> -#include <linux/slab.h> #include <linux/delay.h> #include <sound/core.h> #include "pmac.h" diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index d06f780bd7e..8f064c7ce74 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -22,7 +22,6 @@ #include <linux/init.h> #include <linux/i2c.h> #include <linux/delay.h> -#include <linux/slab.h> #include <sound/core.h> #include "pmac.h" diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 53c81a54761..2f12da4da56 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -20,10 +20,10 @@ #include <linux/dma-mapping.h> #include <linux/dmapool.h> +#include <linux/gfp.h> #include <linux/init.h> #include <linux/interrupt.h> #include <linux/io.h> -#include <linux/slab.h> #include <sound/asound.h> #include <sound/control.h> |