diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 09:51:52 -0600 |
commit | ed7b44af3517441ba46b84da13773d24809ffdd3 (patch) | |
tree | 7064703c5d63d44700085cd701703457730bc06e /include/linux/hid.h | |
parent | a1a1415e5ea2d2241df208a7777a4f38aba9ed5a (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 81aa84d60c6b..fa8ee9cef7be 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -791,6 +791,7 @@ dbg_hid(const char *fmt, ...) __FILE__ , ## arg) #endif /* HID_FF */ +#ifdef __KERNEL__ #ifdef CONFIG_HID_COMPAT #define HID_COMPAT_LOAD_DRIVER(name) \ /* prototype to avoid sparse warning */ \ @@ -804,6 +805,7 @@ EXPORT_SYMBOL(hid_compat_##name) extern void hid_compat_##name(void); \ hid_compat_##name(); \ } while (0) +#endif /* __KERNEL__ */ #endif |