diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-04-21 05:10:42 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-21 05:10:42 -0400 |
commit | d431b2e33cd54e4334019a95979ae93aea4735e8 (patch) | |
tree | 232db290b26d59268bc904729d2efc675964220b /samples | |
parent | cb3e85fe19575cce8af82bc62a070c72e8f781b8 (diff) |
HID: hid-example: fix some build issues
samples/hid-example.o needs some Kconfig and Makefile additions in order
to build. It should use <linux/*.h> headers from the build tree, so use
HEADERS_CHECK to require that those header files be present.
Change the kconfig symbol from tristate to bool since userspace cannot be
built as loadable modules.
However, I don't understand why the userspace header files are not present
as reported in Andrew's build log, since it builds OK on x86_64 without
any of these changes.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Alan Ott <alan@signal11.us>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'samples')
-rw-r--r-- | samples/Kconfig | 4 | ||||
-rw-r--r-- | samples/hidraw/Makefile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index 52f4264b3006..977980317a7d 100644 --- a/samples/Kconfig +++ b/samples/Kconfig | |||
@@ -62,8 +62,8 @@ config SAMPLE_KDB | |||
62 | command to the kdb shell. | 62 | command to the kdb shell. |
63 | 63 | ||
64 | config SAMPLE_HIDRAW | 64 | config SAMPLE_HIDRAW |
65 | tristate "Build simple hidraw example" | 65 | bool "Build simple hidraw example" |
66 | depends on HIDRAW | 66 | depends on HIDRAW && HEADERS_CHECK |
67 | help | 67 | help |
68 | Build an example of how to use hidraw from userspace. | 68 | Build an example of how to use hidraw from userspace. |
69 | 69 | ||
diff --git a/samples/hidraw/Makefile b/samples/hidraw/Makefile index 7811cb0289aa..382eeae77bd6 100644 --- a/samples/hidraw/Makefile +++ b/samples/hidraw/Makefile | |||
@@ -6,3 +6,5 @@ hostprogs-y := hid-example | |||
6 | 6 | ||
7 | # Tell kbuild to always build the programs | 7 | # Tell kbuild to always build the programs |
8 | always := $(hostprogs-y) | 8 | always := $(hostprogs-y) |
9 | |||
10 | HOSTCFLAGS_hid-example.o += -I$(objtree)/usr/include | ||