diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /include/linux/isdn.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/isdn.h')
| -rw-r--r-- | include/linux/isdn.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 4ccf95d681b4..292f27a793d4 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h | |||
| @@ -187,7 +187,7 @@ typedef struct { | |||
| 187 | #endif | 187 | #endif |
| 188 | 188 | ||
| 189 | #include <linux/ppp_defs.h> | 189 | #include <linux/ppp_defs.h> |
| 190 | #include <linux/if_ppp.h> | 190 | #include <linux/ppp-ioctl.h> |
| 191 | 191 | ||
| 192 | #include <linux/isdn_ppp.h> | 192 | #include <linux/isdn_ppp.h> |
| 193 | #endif | 193 | #endif |