Commit f713ad93 authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] v4l-saa7134-module fix

New version, this time using a #define, which should kill the reference
to need_* as well ...
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 56a47751
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/config.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -225,6 +226,8 @@ static void dump_statusregs(struct saa7134_dev *dev) ...@@ -225,6 +226,8 @@ static void dump_statusregs(struct saa7134_dev *dev)
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* delayed request_module */ /* delayed request_module */
#ifdef CONFIG_MODULES
static int need_empress; static int need_empress;
static int need_dvb; static int need_dvb;
...@@ -265,6 +268,12 @@ static void request_module_depend(char *name, int *flag) ...@@ -265,6 +268,12 @@ static void request_module_depend(char *name, int *flag)
} }
} }
#else
#define request_module_depend(name,flag)
#endif /* CONFIG_MODULES */
/* ------------------------------------------------------------------ */ /* ------------------------------------------------------------------ */
/* nr of (saa7134-)pages for the given buffer size */ /* nr of (saa7134-)pages for the given buffer size */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment