diff options
| author | NeilBrown <neilb@suse.de> | 2010-05-21 18:31:36 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-21 18:31:36 -0400 |
| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 (patch) | |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 /sound/ppc/snd_ps3.c | |
| parent | be6800a73aa2f3dc14744c3b80e676d189789f04 (diff) | |
| parent | 3ff195b011d7decf501a4d55aeed312731094796 (diff) | |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'sound/ppc/snd_ps3.c')
| -rw-r--r-- | sound/ppc/snd_ps3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 53c81a547613..2f12da4da561 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c | |||
| @@ -20,10 +20,10 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 22 | #include <linux/dmapool.h> | 22 | #include <linux/dmapool.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | 27 | ||
| 28 | #include <sound/asound.h> | 28 | #include <sound/asound.h> |
| 29 | #include <sound/control.h> | 29 | #include <sound/control.h> |