From e3818a98c2c013a059a973e1cac86a5f9462da64 Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Mon, 3 May 2004 16:36:28 +0000 Subject: - fix include file order in ttpci-driver - convert tda1004x driver to kernel i2c, implement untested firmware loading --- linux/include/media/saa7146.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/include/media') diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index 2e85e7b19..762736f43 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -16,8 +16,8 @@ #include /* for vmalloc_to_page() */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -static inline -int try_module_get(struct module *mod) +#ifndef __CRAP_H +static inline int try_module_get(struct module *mod) { if (!MOD_CAN_QUERY(mod)) return 0; @@ -29,7 +29,7 @@ int try_module_get(struct module *mod) #define iminor(xx) minor(xx->i_rdev) #define strlcpy strncpy #define i2c_get_adapdata(adapter) (struct saa7146_dev*)adapter->data; - +#endif #endif #define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0) -- cgit v1.2.3