diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 12:31:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 12:31:54 -0500 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /include/linux/if_pppox.h | |
| parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'include/linux/if_pppox.h')
| -rw-r--r-- | include/linux/if_pppox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h index 6fb7f178857..30c88b2245f 100644 --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | #define __LINUX_IF_PPPOX_H | 17 | #define __LINUX_IF_PPPOX_H |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | #include <asm/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 22 | 22 | ||
| 23 | #ifdef __KERNEL__ | 23 | #ifdef __KERNEL__ |