diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-08-26 12:56:05 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-08-26 12:56:05 -0400 |
| commit | 3dae49abef945c55c10fa7c479cfd8fd13af55db (patch) | |
| tree | 487c47c6d23cc28a259b913396aeaff0b792d32d /sound/mips/au1x00.c | |
| parent | 6ce5eecb9cd3ac97b952c50309b87c31488a45e9 (diff) | |
| parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'sound/mips/au1x00.c')
| -rw-r--r-- | sound/mips/au1x00.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index ee0741f9eb53..fbef38a9604a 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
| 41 | #include <linux/version.h> | ||
| 42 | #include <sound/core.h> | 41 | #include <sound/core.h> |
| 43 | #include <sound/initval.h> | 42 | #include <sound/initval.h> |
| 44 | #include <sound/pcm.h> | 43 | #include <sound/pcm.h> |