From c4602328a0543f0d593f700b5526b2cbc4dfdba6 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Thu, 22 May 2008 11:46:32 -0400
Subject: sms1xxx: merge ksyms

From: Steven Toth <stoth@hauppauge.com>

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
---
 linux/drivers/media/mdtv/smscoreapi.c |  2 --
 linux/drivers/media/mdtv/smscoreapi.h | 36 +++++++++++++++++++++++++++++++++++
 linux/drivers/media/mdtv/smsdvb.c     |  1 -
 linux/drivers/media/mdtv/smskdefs.h   | 36 -----------------------------------
 linux/drivers/media/mdtv/smsusb.c     |  1 -
 5 files changed, 36 insertions(+), 40 deletions(-)
 delete mode 100644 linux/drivers/media/mdtv/smskdefs.h

diff --git a/linux/drivers/media/mdtv/smscoreapi.c b/linux/drivers/media/mdtv/smscoreapi.c
index 9358c04a2..f3cdb80a8 100644
--- a/linux/drivers/media/mdtv/smscoreapi.c
+++ b/linux/drivers/media/mdtv/smscoreapi.c
@@ -27,8 +27,6 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 
-#include "smskdefs.h" // device, page, scatterlist, kmutex
-
 #include <linux/firmware.h>
 
 #include "smscoreapi.h"
diff --git a/linux/drivers/media/mdtv/smscoreapi.h b/linux/drivers/media/mdtv/smscoreapi.h
index a8c025f74..c72789acf 100644
--- a/linux/drivers/media/mdtv/smscoreapi.h
+++ b/linux/drivers/media/mdtv/smscoreapi.h
@@ -1,6 +1,42 @@
 #ifndef __smscoreapi_h__
 #define __smscoreapi_h__
 
+/* From sysksyms.h */
+
+#include <linux/version.h>
+#include <linux/device.h>
+#include <linux/list.h>
+#include <linux/mm.h>
+#include <asm/scatterlist.h>
+#include <asm/page.h>
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+#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_)
+#define kmutex_unlock(_p_) mutex_unlock(_p_)
+
+#else
+#include <asm/semaphore.h>
+
+typedef struct semaphore kmutex_t;
+
+#define kmutex_init(_p_) init_MUTEX(_p_)
+#define kmutex_lock(_p_) down(_p_)
+#define kmutex_trylock(_p_) (!down_trylock(_p_))
+#define kmutex_unlock(_p_) up(_p_)
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+void *kzalloc(size_t size, int flags);
+#endif
+#endif // LINUX_VERSION
+
+/* End  sysksyms.h */
+
 #ifndef min
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #endif
diff --git a/linux/drivers/media/mdtv/smsdvb.c b/linux/drivers/media/mdtv/smsdvb.c
index ecba51c8b..11a9b0b11 100644
--- a/linux/drivers/media/mdtv/smsdvb.c
+++ b/linux/drivers/media/mdtv/smsdvb.c
@@ -6,7 +6,6 @@
 #include "dvb_demux.h"
 #include "dvb_frontend.h"
 
-#include "smskdefs.h" // page, scatterlist, kmutex
 #include "smscoreapi.h"
 #include "smstypes.h"
 
diff --git a/linux/drivers/media/mdtv/smskdefs.h b/linux/drivers/media/mdtv/smskdefs.h
deleted file mode 100644
index e2483d81c..000000000
--- a/linux/drivers/media/mdtv/smskdefs.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __smskdefs_h__
-#define __smskdefs_h__
-
-#include <linux/version.h>
-#include <linux/device.h>
-#include <linux/list.h>
-#include <linux/mm.h>
-#include <asm/scatterlist.h>
-#include <asm/page.h>
-
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
-#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_)
-#define kmutex_unlock(_p_) mutex_unlock(_p_)
-
-#else
-#include <asm/semaphore.h>
-
-typedef struct semaphore kmutex_t;
-
-#define kmutex_init(_p_) init_MUTEX(_p_)
-#define kmutex_lock(_p_) down(_p_)
-#define kmutex_trylock(_p_) (!down_trylock(_p_))
-#define kmutex_unlock(_p_) up(_p_)
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-void *kzalloc(size_t size, int flags);
-#endif
-#endif // LINUX_VERSION
-
-#endif // __smskdefs_h__
diff --git a/linux/drivers/media/mdtv/smsusb.c b/linux/drivers/media/mdtv/smsusb.c
index cda0581e3..98e3a077e 100644
--- a/linux/drivers/media/mdtv/smsusb.c
+++ b/linux/drivers/media/mdtv/smsusb.c
@@ -4,7 +4,6 @@
 #include <linux/usb.h>
 #include <linux/firmware.h>
 
-#include "smskdefs.h" // page, scatterlist, kmutex
 #include "smscoreapi.h"
 #include "smstypes.h"
 
-- 
cgit v1.2.3