The patch number 8263 was added via Michael Krufky <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Steven Toth <[EMAIL PROTECTED]>
sms1xxx: merge ksyms
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
---
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(-)
diff -r d57ce25e81ca -r 7085d1fd3a67 linux/drivers/media/mdtv/smscoreapi.c
--- a/linux/drivers/media/mdtv/smscoreapi.c Mon May 19 15:09:21 2008 -0400
+++ b/linux/drivers/media/mdtv/smscoreapi.c Thu May 22 11:46:32 2008 -0400
@@ -26,8 +26,6 @@
#include <linux/dma-mapping.h>
#include <linux/delay.h>
#include <asm/io.h>
-
-#include "smskdefs.h" // device, page, scatterlist, kmutex
#include <linux/firmware.h>
diff -r d57ce25e81ca -r 7085d1fd3a67 linux/drivers/media/mdtv/smscoreapi.h
--- a/linux/drivers/media/mdtv/smscoreapi.h Mon May 19 15:09:21 2008 -0400
+++ b/linux/drivers/media/mdtv/smscoreapi.h Thu May 22 11:46:32 2008 -0400
@@ -1,5 +1,41 @@
#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))
diff -r d57ce25e81ca -r 7085d1fd3a67 linux/drivers/media/mdtv/smsdvb.c
--- a/linux/drivers/media/mdtv/smsdvb.c Mon May 19 15:09:21 2008 -0400
+++ b/linux/drivers/media/mdtv/smsdvb.c Thu May 22 11:46:32 2008 -0400
@@ -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 -r d57ce25e81ca -r 7085d1fd3a67 linux/drivers/media/mdtv/smskdefs.h
--- a/linux/drivers/media/mdtv/smskdefs.h Mon May 19 15:09:21 2008 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r d57ce25e81ca -r 7085d1fd3a67 linux/drivers/media/mdtv/smsusb.c
--- a/linux/drivers/media/mdtv/smsusb.c Mon May 19 15:09:21 2008 -0400
+++ b/linux/drivers/media/mdtv/smsusb.c Thu May 22 11:46:32 2008 -0400
@@ -4,7 +4,6 @@
#include <linux/usb.h>
#include <linux/firmware.h>
-#include "smskdefs.h" // page, scatterlist, kmutex
#include "smscoreapi.h"
#include "smstypes.h"
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/7085d1fd3a67cfba5c112a6025d8e6ce68ddcdd0
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
