]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
2 | Subject: Staging: workaround build system bug | |
3 | Patch-mainline: 2.6.28 | |
4 | ||
5 | This is needed as CONFIG_STAGING is set to y, yet there is no code in | |
6 | drivers/staging/ to build, so the build-in.o doesn't get created | |
7 | properly. Create a "dummy" module in drivers/staging called staging.c | |
8 | to work around this bug. | |
9 | ||
10 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
11 | ||
12 | --- | |
13 | drivers/staging/Makefile | 3 +++ | |
14 | drivers/staging/staging.c | 19 +++++++++++++++++++ | |
15 | 2 files changed, 22 insertions(+) | |
16 | ||
17 | --- a/drivers/staging/Makefile | |
18 | +++ b/drivers/staging/Makefile | |
19 | @@ -1,5 +1,8 @@ | |
20 | # Makefile for staging directory | |
21 | ||
22 | +# fix for build system bug... | |
23 | +obj-$(CONFIG_STAGING) += staging.o | |
24 | + | |
25 | obj-$(CONFIG_ET131X) += et131x/ | |
26 | obj-$(CONFIG_SLICOSS) += slicoss/ | |
27 | obj-$(CONFIG_SXG) += sxg/ | |
28 | --- /dev/null | |
29 | +++ b/drivers/staging/staging.c | |
30 | @@ -0,0 +1,19 @@ | |
31 | +#include <linux/kernel.h> | |
32 | +#include <linux/init.h> | |
33 | +#include <linux/module.h> | |
34 | + | |
35 | +static int __init staging_init(void) | |
36 | +{ | |
37 | + return 0; | |
38 | +} | |
39 | + | |
40 | +static void __exit staging_exit(void) | |
41 | +{ | |
42 | +} | |
43 | + | |
44 | +module_init(staging_init); | |
45 | +module_exit(staging_exit); | |
46 | + | |
47 | +MODULE_AUTHOR("Greg Kroah-Hartman"); | |
48 | +MODULE_DESCRIPTION("Staging Core"); | |
49 | +MODULE_LICENSE("GPL"); |