diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /include/linux/synclink.h | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
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 |