Commit 955e9ca3 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8263): sms1xxx: merge ksyms 



Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c6465799

drivers/media/mdtv/smscoreapi.c

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/media/mdtv/smscoreapi.h

+21 −0
Original line number Diff line number Diff line 
#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>



#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_)





/* End  sysksyms.h */



#ifndef min

#define min(a,b) (((a) < (b)) ? (a) : (b))

#endif

drivers/media/mdtv/smsdvb.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include "dvb_demux.h"

#include "dvb_frontend.h"



#include "smskdefs.h" // page, scatterlist, kmutex

#include "smscoreapi.h"

#include "smstypes.h"

drivers/media/mdtv/smskdefs.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#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>



#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_)





#endif // __smskdefs_h__

drivers/media/mdtv/smsusb.c

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <linux/usb.h>

#include <linux/firmware.h>



#include "smskdefs.h" // page, scatterlist, kmutex

#include "smscoreapi.h"

#include "smstypes.h"