1 files changed, 7 insertions, 14 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 7b77d4862..1e9d07b8f 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -21,8 +21,7 @@
  *
  */
 
-#include <asm/types.h>
-#include <asm/semaphore.h>
+#include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/module.h>
@@ -57,8 +56,7 @@ static char *dnames[] = {
 	#define DVB_MAX_IDS              4
 	#define nums2minor(num,type,id)  ((num << 6) | (id << 4) | type)
 
-static
-struct dvb_device* dvbdev_find_device (int minor)
+static struct dvb_device* dvbdev_find_device (int minor)
 {
 	struct list_head *entry;
 
@@ -78,8 +76,7 @@ struct dvb_device* dvbdev_find_device (int minor)
 }
 
 
-static
-int dvb_device_open(struct inode *inode, struct file *file)
+static int dvb_device_open(struct inode *inode, struct file *file)
 {
 	struct dvb_device *dvbdev;
 	
@@ -165,8 +162,7 @@ int dvb_generic_ioctl(struct inode *inode, struct file *file,
 }
 
 
-static
-int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
+static int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
 {
 	u32 id = 0;
 
@@ -263,8 +259,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
 }
 
 
-static
-int dvbdev_get_free_adapter_num (void)
+static int dvbdev_get_free_adapter_num (void)
 {
 	int num = 0;
 
@@ -344,8 +339,7 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
 }
 
 
-static
-int __init init_dvbdev(void)
+static int __init init_dvbdev(void)
 {
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 	dvb_devfs_handle = devfs_mk_dir (NULL, "dvb", NULL);
@@ -362,8 +356,7 @@ int __init init_dvbdev(void)
 }
 
 
-static 
-void __exit exit_dvbdev(void)
+static void __exit exit_dvbdev(void)
 {
 #ifndef CONFIG_DVB_DEVFS_ONLY
 	unregister_chrdev(DVB_MAJOR, "DVB");