diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 10:32:56 -0500 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /sound/core | |
| parent | eb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff) | |
| parent | 8576762ff5d109b841fcf4e7d3883e0cf794f3cf (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 59202de1d2ce..41e224986f35 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
| @@ -28,6 +28,8 @@ | |||
| 28 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/pm.h> | 30 | #include <linux/pm.h> |
| 31 | #include <linux/platform_device.h> | ||
| 32 | |||
| 31 | #include <sound/core.h> | 33 | #include <sound/core.h> |
| 32 | #include <sound/control.h> | 34 | #include <sound/control.h> |
| 33 | #include <sound/info.h> | 35 | #include <sound/info.h> |