summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-10-13 14:32:52 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-13 14:32:52 -0700
commit86f69fe9c069dd8608d238581eea259caa1dfc99 (patch)
tree2a252ac23a60e60b5fa2b6b99d29806d8d2d59be
parent5c7514e0610249a4e7710eefd801c2b0442eb8ea (diff)
downloadop-kernel-dev-86f69fe9c069dd8608d238581eea259caa1dfc99.zip
op-kernel-dev-86f69fe9c069dd8608d238581eea259caa1dfc99.tar.gz
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>
-rw-r--r--drivers/staging/Makefile3
-rw-r--r--drivers/staging/staging.c19
2 files changed, 22 insertions, 0 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 93decb8..7c466e9 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 0000000..233e589
--- /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");
OpenPOWER on IntegriCloud