diff options
| author | Steven Toth <stoth@hauppauge.com> | 2008-05-22 15:46:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 07:19:58 -0300 |
| commit | 955e9ca3cdeae62e8067ede204b5a02dcde6813e (patch) | |
| tree | c946c623652c94f4d99a4936432868e9795adc26 | |
| parent | c6465799c38762b963bb819e033d2a56a3d3c233 (diff) | |
V4L/DVB (8263): sms1xxx: merge ksyms
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/mdtv/smscoreapi.c | 2 | ||||
| -rw-r--r-- | drivers/media/mdtv/smscoreapi.h | 21 | ||||
| -rw-r--r-- | drivers/media/mdtv/smsdvb.c | 1 | ||||
| -rw-r--r-- | drivers/media/mdtv/smskdefs.h | 21 | ||||
| -rw-r--r-- | drivers/media/mdtv/smsusb.c | 1 |
5 files changed, 21 insertions, 25 deletions
diff --git a/drivers/media/mdtv/smscoreapi.c b/drivers/media/mdtv/smscoreapi.c index 31531948379..a30be830142 100644 --- a/drivers/media/mdtv/smscoreapi.c +++ b/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/drivers/media/mdtv/smscoreapi.h b/drivers/media/mdtv/smscoreapi.h index a8c025f74eb..43ebee68f77 100644 --- a/drivers/media/mdtv/smscoreapi.h +++ b/drivers/media/mdtv/smscoreapi.h @@ -1,6 +1,27 @@ #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 diff --git a/drivers/media/mdtv/smsdvb.c b/drivers/media/mdtv/smsdvb.c index ecba51c8b65..11a9b0b11cb 100644 --- a/drivers/media/mdtv/smsdvb.c +++ b/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/drivers/media/mdtv/smskdefs.h b/drivers/media/mdtv/smskdefs.h deleted file mode 100644 index 6874fbcdc7a..00000000000 --- a/drivers/media/mdtv/smskdefs.h +++ /dev/null @@ -1,21 +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> - -#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__ diff --git a/drivers/media/mdtv/smsusb.c b/drivers/media/mdtv/smsusb.c index 43af826b383..c076c046bf5 100644 --- a/drivers/media/mdtv/smsusb.c +++ b/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" |