aboutsummaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 07:32:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 07:32:56 -0800
commit4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch)
tree50774592eaba942cf378fca731d307f901b737b7 /sound/core
parenteb16292ba8a6655a560ab10a7d73a7816f0c0ac0 (diff)
parent8576762ff5d109b841fcf4e7d3883e0cf794f3cf (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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/init.c b/sound/core/init.c
index 59202de1d2c..41e224986f3 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -28,6 +28,8 @@
#include <linux/ctype.h>
#include <linux/pci.h>
#include <linux/pm.h>
+#include <linux/platform_device.h>
+
#include <sound/core.h>
#include <sound/control.h>
#include <sound/info.h>