On Mon, Jan 24, 2005 at 12:17:13PM +0100, Adrian Bunk wrote:
> On Mon, Jan 24, 2005 at 02:15:16AM -0800, Andrew Morton wrote:
> >...
> > +v4l-saa7134-module.patch
>
> This patch broke compilation with CONFIG_MODULES=n:
>
> drivers/media/video/saa7134/saa7134-core.c: In function `pending_call':
> drivers/media/video/saa7134/saa7134-core.c:234: error: `MODULE_STATE_LIVE'
> undeclared (first use in this function)
The patch below should fix this.
Gerd
Index: linux-2.6.11-rc2/drivers/media/video/saa7134/saa7134-core.c
===================================================================
--- linux-2.6.11-rc2.orig/drivers/media/video/saa7134/saa7134-core.c
2005-01-24 11:05:45.000000000 +0100
+++ linux-2.6.11-rc2/drivers/media/video/saa7134/saa7134-core.c 2005-01-24
14:54:29.000000000 +0100
@@ -21,6 +21,7 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/list.h>
#include <linux/module.h>
@@ -225,6 +226,8 @@ static void dump_statusregs(struct saa71
/* ----------------------------------------------------------- */
/* delayed request_module */
+#ifdef CONFIG_MODULES
+
static int need_empress;
static int need_dvb;
@@ -265,6 +268,12 @@ static void request_module_depend(char *
}
}
+#else
+
+static inline void request_module_depend(char *name, int *flag) {}
+
+#endif /* CONFIG_MODULES */
+
/* ------------------------------------------------------------------ */
/* nr of (saa7134-)pages for the given buffer size */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
