diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index 1dd196600036cacae77ebeac9892555c7a5f82d4..9e7730a40e0f9429ab6d64700694791100753a9a 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -112,10 +112,10 @@ struct smscore_registry_entry_t {
 
 struct list_head g_smscore_notifyees;
 struct list_head g_smscore_devices;
-kmutex_t g_smscore_deviceslock;
+struct mutex g_smscore_deviceslock;
 
 struct list_head g_smscore_registry;
-kmutex_t g_smscore_registrylock;
+struct mutex g_smscore_registrylock;
 
 static int default_mode = 4;
 
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index eeb5c0a7f62bd4eb586e82a5b2211604175bd38d..fb6acaefcbc6f18e1074eb77f6e741c8188c90ba 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -36,8 +36,6 @@
 
 #include <linux/mutex.h>
 
-typedef struct mutex kmutex_t;
-
 #define kmutex_init(_p_) mutex_init(_p_)
 #define kmutex_lock(_p_) mutex_lock(_p_)
 #define kmutex_trylock(_p_) mutex_trylock(_p_)
@@ -392,7 +390,8 @@ extern void smscore_onresponse(struct smscore_device_t *coredev,
 			       struct smscore_buffer_t *cb);
 
 
-extern struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
+extern
+struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
 extern void smscore_putbuffer(struct smscore_device_t *coredev,
 			      struct smscore_buffer_t *cb);
 
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 72d1de7a6dea1cfcdd133c4fc9d4084097c92631..6f9c1856386742c895727020547de72960e72f64 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -28,7 +28,7 @@
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct list_head g_smsdvb_clients;
-kmutex_t g_smsdvb_clientslock;
+struct mutex g_smsdvb_clientslock;
 
 static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb)
 {