diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/drivers/mtpav.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/drivers/mtpav.c')
| -rw-r--r-- | sound/drivers/mtpav.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index da03597fc893..5c426df87678 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c | |||
| @@ -55,14 +55,13 @@ | |||
| 55 | #include <linux/err.h> | 55 | #include <linux/err.h> |
| 56 | #include <linux/platform_device.h> | 56 | #include <linux/platform_device.h> |
| 57 | #include <linux/ioport.h> | 57 | #include <linux/ioport.h> |
| 58 | #include <linux/io.h> | ||
| 58 | #include <linux/moduleparam.h> | 59 | #include <linux/moduleparam.h> |
| 59 | #include <sound/core.h> | 60 | #include <sound/core.h> |
| 60 | #include <sound/initval.h> | 61 | #include <sound/initval.h> |
| 61 | #include <sound/rawmidi.h> | 62 | #include <sound/rawmidi.h> |
| 62 | #include <linux/delay.h> | 63 | #include <linux/delay.h> |
| 63 | 64 | ||
| 64 | #include <asm/io.h> | ||
| 65 | |||
| 66 | /* | 65 | /* |
| 67 | * globals | 66 | * globals |
| 68 | */ | 67 | */ |