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/synclink.h | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'include/linux/synclink.h')
| -rw-r--r-- | include/linux/synclink.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/synclink.h b/include/linux/synclink.h index c844a229acc9..99b8bdb17b2b 100644 --- a/include/linux/synclink.h +++ b/include/linux/synclink.h | |||
| @@ -13,6 +13,8 @@ | |||
| 13 | #define _SYNCLINK_H_ | 13 | #define _SYNCLINK_H_ |
| 14 | #define SYNCLINK_H_VERSION 3.6 | 14 | #define SYNCLINK_H_VERSION 3.6 |
| 15 | 15 | ||
| 16 | #include <linux/types.h> | ||
| 17 | |||
| 16 | #define BIT0 0x0001 | 18 | #define BIT0 0x0001 |
| 17 | #define BIT1 0x0002 | 19 | #define BIT1 0x0002 |
| 18 | #define BIT2 0x0004 | 20 | #define BIT2 0x0004 |