diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /sound/drivers/mtpav.c | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.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 | */ |