diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-09-11 08:29:53 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-09-11 10:06:22 -0400 |
commit | e9a7c79b9427b9c1ce17a007a80caf3deb390bcd (patch) | |
tree | 96c544f3310f263999cf04301b6bf31451cac0be | |
parent | 02d9be1aa6e93f4819f230a1d570e2ff415fa294 (diff) |
HID: picolcd: fix build error if !CONFIG_DEBUG_FS
Current code missed the definition for picolcd_debug_out_report, but add
definition for picolcd_debug_raw_event twice.
This patch fixes below build error:
CC [M] drivers/hid/hid-picolcd_core.o
In file included from drivers/hid/hid-picolcd_core.c:34:0:
drivers/hid/hid-picolcd.h:176:20: error: redefinition of 'picolcd_debug_raw_event'
drivers/hid/hid-picolcd.h:162:20: note: previous definition of 'picolcd_debug_raw_event' was here
make[2]: *** [drivers/hid/hid-picolcd_core.o] Error 1
make[1]: *** [drivers/hid] Error 2
make: *** [drivers] Error 2
if CONFIG_DEBUG_FS is unset.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-picolcd.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/hid/hid-picolcd.h b/drivers/hid/hid-picolcd.h index 240eb1cd872e..020cef69f6a1 100644 --- a/drivers/hid/hid-picolcd.h +++ b/drivers/hid/hid-picolcd.h | |||
@@ -159,6 +159,10 @@ void picolcd_init_devfs(struct picolcd_data *data, | |||
159 | 159 | ||
160 | void picolcd_exit_devfs(struct picolcd_data *data); | 160 | void picolcd_exit_devfs(struct picolcd_data *data); |
161 | #else | 161 | #else |
162 | static inline void picolcd_debug_out_report(struct picolcd_data *data, | ||
163 | struct hid_device *hdev, struct hid_report *report) | ||
164 | { | ||
165 | } | ||
162 | static inline void picolcd_debug_raw_event(struct picolcd_data *data, | 166 | static inline void picolcd_debug_raw_event(struct picolcd_data *data, |
163 | struct hid_device *hdev, struct hid_report *report, | 167 | struct hid_device *hdev, struct hid_report *report, |
164 | u8 *raw_data, int size) | 168 | u8 *raw_data, int size) |
@@ -173,11 +177,6 @@ static inline void picolcd_init_devfs(struct picolcd_data *data, | |||
173 | static inline void picolcd_exit_devfs(struct picolcd_data *data) | 177 | static inline void picolcd_exit_devfs(struct picolcd_data *data) |
174 | { | 178 | { |
175 | } | 179 | } |
176 | static inline void picolcd_debug_raw_event(struct picolcd_data *data, | ||
177 | struct hid_device *hdev, struct hid_report *report, | ||
178 | u8 *raw_data, int size) | ||
179 | { | ||
180 | } | ||
181 | #endif /* CONFIG_DEBUG_FS */ | 180 | #endif /* CONFIG_DEBUG_FS */ |
182 | 181 | ||
183 | 182 | ||