Merge branch 'topic/echoaudio' into for-linus

[linux-2.6-omap-h63xx.git] / include / linux / dvb / dmx.h

diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
index 402fb7a8d922531809a2b19a4ec1d590587e578f..fef943738a24d56127516c1abbf863c8e79b5ed0 100644 (file)
--- a/include/linux/dvb/dmx.h
+++ b/include/linux/dvb/dmx.h
@@ -24,7 +24,7 @@
 #ifndef _DVBDMX_H_
 #define _DVBDMX_H_
 
-#include <asm/types.h>
+#include <linux/types.h>
 #ifdef __KERNEL__
 #include <linux/time.h>
 #else