diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /include/linux/if_ppp.h | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/linux/if_ppp.h')
| -rw-r--r-- | include/linux/if_ppp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_ppp.h b/include/linux/if_ppp.h index c3b1f8562709..fcef103aa3f6 100644 --- a/include/linux/if_ppp.h +++ b/include/linux/if_ppp.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #ifndef _IF_PPP_H_ | 33 | #ifndef _IF_PPP_H_ |
| 34 | #define _IF_PPP_H_ | 34 | #define _IF_PPP_H_ |
| 35 | 35 | ||
| 36 | #include <linux/types.h> | ||
| 36 | #include <linux/compiler.h> | 37 | #include <linux/compiler.h> |
| 37 | 38 | ||
| 38 | /* | 39 | /* |