diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /sound/sound_firmware.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'sound/sound_firmware.c')
| -rw-r--r-- | sound/sound_firmware.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/sound_firmware.c b/sound/sound_firmware.c index 3304344713ae..96deaefaa897 100644 --- a/sound/sound_firmware.c +++ b/sound/sound_firmware.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <linux/fs.h> | 3 | #include <linux/fs.h> |
| 4 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 5 | #include <linux/slab.h> | 5 | #include <linux/slab.h> |
| 6 | #include <linux/sched.h> | ||
| 6 | #include <asm/uaccess.h> | 7 | #include <asm/uaccess.h> |
| 7 | #include "oss/sound_firmware.h" | 8 | #include "oss/sound_firmware.h" |
| 8 | 9 | ||