From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 13 Oct 2008 21:32:52 +0000 (-0700)
Subject: Staging: workaround build system bug
X-Git-Tag: v2.6.28-rc1~258^2~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=86f69fe9c069dd8608d238581eea259caa1dfc99;p=linux-2.6-omap-h63xx.git

Staging: workaround build system bug

This is needed as CONFIG_STAGING is set to y, yet there is no code in
drivers/staging/ to build, so the build-in.o doesn't get created
properly.  Create a "dummy" module in drivers/staging called staging.c
to work around this bug.

Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 93decb89b1d..7c466e94fd9 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -1,5 +1,8 @@
 # Makefile for staging directory
 
+# fix for build system bug...
+obj-$(CONFIG_STAGING)		+= staging.o
+
 obj-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_SXG)		+= sxg/
diff --git a/drivers/staging/staging.c b/drivers/staging/staging.c
new file mode 100644
index 00000000000..233e589c093
--- /dev/null
+++ b/drivers/staging/staging.c
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+
+static int __init staging_init(void)
+{
+	return 0;
+}
+
+static void __exit staging_exit(void)
+{
+}
+
+module_init(staging_init);
+module_exit(staging_exit);
+
+MODULE_AUTHOR("Greg Kroah-Hartman");
+MODULE_DESCRIPTION("Staging Core");
+MODULE_LICENSE("GPL");