diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/linux/kprobes.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/kprobes.h')
| -rw-r--r-- | include/linux/kprobes.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 778adc0fa640..8bf6702da2a0 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi | 29 | * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi |
| 30 | * <prasanna@in.ibm.com> added function-return probes. | 30 | * <prasanna@in.ibm.com> added function-return probes. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/list.h> | 32 | #include <linux/list.h> |
| 34 | #include <linux/notifier.h> | 33 | #include <linux/notifier.h> |
| 35 | #include <linux/smp.h> | 34 | #include <linux/smp.h> |