diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-27 22:47:51 -0400 |
| commit | 0e9882b4fb8703f13921279fe4a6592574f92c62 (patch) | |
| tree | 001ea9826ec3011e19986eb81cc7597d58f4f999 /include/linux | |
| parent | c4bb07ec0084e26323047bcbe446d59ac352e07f (diff) | |
| parent | 24d6a9d07f7da6c635530688a43086ea293bf9dc (diff) | |
Merge commit 'v2.6.38.1' into linaro-2.6.38
Conflicts:
drivers/usb/core/hcd-pci.c
drivers/usb/host/isp1760-hcd.c
include/linux/usb/ch9.h
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ftrace.h | 2 | ||||
| -rw-r--r-- | include/linux/hid.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index dcd6a7c3a43..ca29e03c1fa 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -428,6 +428,7 @@ extern void unregister_ftrace_graph(void); extern void ftrace_graph_init_task(struct task_struct *t); extern void ftrace_graph_exit_task(struct task_struct *t); +extern void ftrace_graph_init_idle_task(struct task_struct *t, int cpu); static inline int task_curr_ret_stack(struct task_struct *t) { @@ -451,6 +452,7 @@ static inline void unpause_graph_tracing(void) static inline void ftrace_graph_init_task(struct task_struct *t) { } static inline void ftrace_graph_exit_task(struct task_struct *t) { } +static inline void ftrace_graph_init_idle_task(struct task_struct *t, int cpu) { } static inline int register_ftrace_graph(trace_func_graph_ret_t retfunc, trace_func_graph_ent_t entryfunc) diff --git a/include/linux/hid.h b/include/linux/hid.h index d91c25e253c..fc5faf60f6d 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -638,7 +638,7 @@ struct hid_driver { struct hid_input *hidinput, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max); void (*feature_mapping)(struct hid_device *hdev, - struct hid_input *hidinput, struct hid_field *field, + struct hid_field *field, struct hid_usage *usage); #ifdef CONFIG_PM int (*suspend)(struct hid_device *hdev, pm_message_t message); |